swagger_aem 2.5.0 → 3.4.0

data/lib/swagger_aem/api/custom_api.rb

@@ -3,14 +3,14 @@
 
 #Swagger AEM is an OpenAPI specification for Adobe Experience Manager (AEM) API
 
-OpenAPI spec version: 2.4.0
+The version of the OpenAPI document: 3.4.0
 Contact: opensource@shinesolutions.com
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 4.3.1
 
 =end
 
-require "uri"
+require 'cgi'
 
 module SwaggerAemClient
   class CustomApi
@@ -19,158 +19,170 @@ module SwaggerAemClient
     def initialize(api_client = ApiClient.default)
       @api_client = api_client
     end
-
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :tags 
-    # @option opts [BOOLEAN] :combine_tags_or 
+    # @option opts [Boolean] :combine_tags_or 
     # @return [String]
     def get_aem_health_check(opts = {})
       data, _status_code, _headers = get_aem_health_check_with_http_info(opts)
-      return data
+      data
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :tags 
-    # @option opts [BOOLEAN] :combine_tags_or 
-    # @return [Array<(String, Fixnum, Hash)>] String data, response status code and response headers
+    # @option opts [Boolean] :combine_tags_or 
+    # @return [Array<(String, Integer, Hash)>] String data, response status code and response headers
     def get_aem_health_check_with_http_info(opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: CustomApi.get_aem_health_check ..."
+        @api_client.config.logger.debug 'Calling API: CustomApi.get_aem_health_check ...'
       end
       # resource path
-      local_var_path = "/system/health"
+      local_var_path = '/system/health'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'tags'] = opts[:'tags'] if !opts[:'tags'].nil?
       query_params[:'combineTagsOr'] = opts[:'combine_tags_or'] if !opts[:'combine_tags_or'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'String' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'String')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: CustomApi#get_aem_health_check\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @option opts [Array<String>] :bundles_ignored 
     # @option opts [String] :bundles_ignored_type_hint 
     # @return [nil]
     def post_config_aem_health_check_servlet(opts = {})
       post_config_aem_health_check_servlet_with_http_info(opts)
-      return nil
+      nil
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @option opts [Array<String>] :bundles_ignored 
     # @option opts [String] :bundles_ignored_type_hint 
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def post_config_aem_health_check_servlet_with_http_info(opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: CustomApi.post_config_aem_health_check_servlet ..."
+        @api_client.config.logger.debug 'Calling API: CustomApi.post_config_aem_health_check_servlet ...'
       end
       # resource path
-      local_var_path = "/apps/system/config/com.shinesolutions.healthcheck.hc.impl.ActiveBundleHealthCheck"
+      local_var_path = '/apps/system/config/com.shinesolutions.healthcheck.hc.impl.ActiveBundleHealthCheck'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'bundles.ignored'] = @api_client.build_collection_param(opts[:'bundles_ignored'], :multi) if !opts[:'bundles_ignored'].nil?
       query_params[:'bundles.ignored@TypeHint'] = opts[:'bundles_ignored_type_hint'] if !opts[:'bundles_ignored_type_hint'].nil?
 
       # header parameters
-      header_params = {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
+      header_params = opts[:header_params] || {}
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: CustomApi#post_config_aem_health_check_servlet\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @option opts [Array<String>] :pwdreset_authorizables 
     # @option opts [String] :pwdreset_authorizables_type_hint 
     # @return [nil]
     def post_config_aem_password_reset(opts = {})
       post_config_aem_password_reset_with_http_info(opts)
-      return nil
+      nil
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @option opts [Array<String>] :pwdreset_authorizables 
     # @option opts [String] :pwdreset_authorizables_type_hint 
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def post_config_aem_password_reset_with_http_info(opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: CustomApi.post_config_aem_password_reset ..."
+        @api_client.config.logger.debug 'Calling API: CustomApi.post_config_aem_password_reset ...'
       end
       # resource path
-      local_var_path = "/apps/system/config/com.shinesolutions.aem.passwordreset.Activator"
+      local_var_path = '/apps/system/config/com.shinesolutions.aem.passwordreset.Activator'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'pwdreset.authorizables'] = @api_client.build_collection_param(opts[:'pwdreset_authorizables'], :multi) if !opts[:'pwdreset_authorizables'].nil?
       query_params[:'pwdreset.authorizables@TypeHint'] = opts[:'pwdreset_authorizables_type_hint'] if !opts[:'pwdreset_authorizables_type_hint'].nil?
 
       # header parameters
-      header_params = {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
+      header_params = opts[:header_params] || {}
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: CustomApi#post_config_aem_password_reset\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end

data/lib/swagger_aem/api/granite_api.rb

@@ -0,0 +1,124 @@
+=begin
+#Adobe Experience Manager (AEM) API
+
+#Swagger AEM is an OpenAPI specification for Adobe Experience Manager (AEM) API
+
+The version of the OpenAPI document: 3.4.0
+Contact: opensource@shinesolutions.com
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 4.3.1
+
+=end
+
+require 'cgi'
+
+module SwaggerAemClient
+  class GraniteApi
+    attr_accessor :api_client
+
+    def initialize(api_client = ApiClient.default)
+      @api_client = api_client
+    end
+    # @param keystore_password [String] 
+    # @param keystore_password_confirm [String] 
+    # @param truststore_password [String] 
+    # @param truststore_password_confirm [String] 
+    # @param https_hostname [String] 
+    # @param https_port [String] 
+    # @param [Hash] opts the optional parameters
+    # @option opts [File] :privatekey_file 
+    # @option opts [File] :certificate_file 
+    # @return [String]
+    def ssl_setup(keystore_password, keystore_password_confirm, truststore_password, truststore_password_confirm, https_hostname, https_port, opts = {})
+      data, _status_code, _headers = ssl_setup_with_http_info(keystore_password, keystore_password_confirm, truststore_password, truststore_password_confirm, https_hostname, https_port, opts)
+      data
+    end
+
+    # @param keystore_password [String] 
+    # @param keystore_password_confirm [String] 
+    # @param truststore_password [String] 
+    # @param truststore_password_confirm [String] 
+    # @param https_hostname [String] 
+    # @param https_port [String] 
+    # @param [Hash] opts the optional parameters
+    # @option opts [File] :privatekey_file 
+    # @option opts [File] :certificate_file 
+    # @return [Array<(String, Integer, Hash)>] String data, response status code and response headers
+    def ssl_setup_with_http_info(keystore_password, keystore_password_confirm, truststore_password, truststore_password_confirm, https_hostname, https_port, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: GraniteApi.ssl_setup ...'
+      end
+      # verify the required parameter 'keystore_password' is set
+      if @api_client.config.client_side_validation && keystore_password.nil?
+        fail ArgumentError, "Missing the required parameter 'keystore_password' when calling GraniteApi.ssl_setup"
+      end
+      # verify the required parameter 'keystore_password_confirm' is set
+      if @api_client.config.client_side_validation && keystore_password_confirm.nil?
+        fail ArgumentError, "Missing the required parameter 'keystore_password_confirm' when calling GraniteApi.ssl_setup"
+      end
+      # verify the required parameter 'truststore_password' is set
+      if @api_client.config.client_side_validation && truststore_password.nil?
+        fail ArgumentError, "Missing the required parameter 'truststore_password' when calling GraniteApi.ssl_setup"
+      end
+      # verify the required parameter 'truststore_password_confirm' is set
+      if @api_client.config.client_side_validation && truststore_password_confirm.nil?
+        fail ArgumentError, "Missing the required parameter 'truststore_password_confirm' when calling GraniteApi.ssl_setup"
+      end
+      # verify the required parameter 'https_hostname' is set
+      if @api_client.config.client_side_validation && https_hostname.nil?
+        fail ArgumentError, "Missing the required parameter 'https_hostname' when calling GraniteApi.ssl_setup"
+      end
+      # verify the required parameter 'https_port' is set
+      if @api_client.config.client_side_validation && https_port.nil?
+        fail ArgumentError, "Missing the required parameter 'https_port' when calling GraniteApi.ssl_setup"
+      end
+      # resource path
+      local_var_path = '/libs/granite/security/post/sslSetup.html'
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+      query_params[:'keystorePassword'] = keystore_password
+      query_params[:'keystorePasswordConfirm'] = keystore_password_confirm
+      query_params[:'truststorePassword'] = truststore_password
+      query_params[:'truststorePasswordConfirm'] = truststore_password_confirm
+      query_params[:'httpsHostname'] = https_hostname
+      query_params[:'httpsPort'] = https_port
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
+      # HTTP header 'Content-Type'
+      header_params['Content-Type'] = @api_client.select_header_content_type(['multipart/form-data'])
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+      form_params['privatekeyFile'] = opts[:'privatekey_file'] if !opts[:'privatekey_file'].nil?
+      form_params['certificateFile'] = opts[:'certificate_file'] if !opts[:'certificate_file'].nil?
+
+      # http body (model)
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'String' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: GraniteApi#ssl_setup\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+  end
+end

data/lib/swagger_aem/api/sling_api.rb

@@ -3,14 +3,14 @@
 
 #Swagger AEM is an OpenAPI specification for Adobe Experience Manager (AEM) API
 
-OpenAPI spec version: 2.4.0
+The version of the OpenAPI document: 3.4.0
 Contact: opensource@shinesolutions.com
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 4.3.1
 
 =end
 
-require "uri"
+require 'cgi'
 
 module SwaggerAemClient
   class SlingApi
@@ -19,27 +19,22 @@ module SwaggerAemClient
     def initialize(api_client = ApiClient.default)
       @api_client = api_client
     end
-
-    # 
-    # 
-    # @param runmode 
-    # @param name 
+    # @param runmode [String] 
+    # @param name [String] 
     # @param [Hash] opts the optional parameters
     # @return [nil]
     def delete_agent(runmode, name, opts = {})
       delete_agent_with_http_info(runmode, name, opts)
-      return nil
+      nil
     end
 
-    # 
-    # 
-    # @param runmode 
-    # @param name 
+    # @param runmode [String] 
+    # @param name [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def delete_agent_with_http_info(runmode, name, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.delete_agent ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.delete_agent ...'
       end
       # verify the required parameter 'runmode' is set
       if @api_client.config.client_side_validation && runmode.nil?
@@ -50,54 +45,58 @@ module SwaggerAemClient
         fail ArgumentError, "Missing the required parameter 'name' when calling SlingApi.delete_agent"
       end
       # resource path
-      local_var_path = "/etc/replication/agents.{runmode}/{name}".sub('{' + 'runmode' + '}', runmode.to_s).sub('{' + 'name' + '}', name.to_s)
+      local_var_path = '/etc/replication/agents.{runmode}/{name}'.sub('{' + 'runmode' + '}', CGI.escape(runmode.to_s)).sub('{' + 'name' + '}', CGI.escape(name.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
+      header_params = opts[:header_params] || {}
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#delete_agent\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
-    # @param path 
-    # @param name 
+    # @param path [String] 
+    # @param name [String] 
     # @param [Hash] opts the optional parameters
     # @return [nil]
     def delete_node(path, name, opts = {})
       delete_node_with_http_info(path, name, opts)
-      return nil
+      nil
     end
 
-    # 
-    # 
-    # @param path 
-    # @param name 
+    # @param path [String] 
+    # @param name [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def delete_node_with_http_info(path, name, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.delete_node ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.delete_node ...'
       end
       # verify the required parameter 'path' is set
       if @api_client.config.client_side_validation && path.nil?
@@ -108,54 +107,58 @@ module SwaggerAemClient
         fail ArgumentError, "Missing the required parameter 'name' when calling SlingApi.delete_node"
       end
       # resource path
-      local_var_path = "/{path}/{name}".sub('{' + 'path' + '}', path.to_s).sub('{' + 'name' + '}', name.to_s)
+      local_var_path = '/{path}/{name}'.sub('{' + 'path' + '}', CGI.escape(path.to_s)).sub('{' + 'name' + '}', CGI.escape(name.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
+      header_params = opts[:header_params] || {}
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#delete_node\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
-    # @param runmode 
-    # @param name 
+    # @param runmode [String] 
+    # @param name [String] 
     # @param [Hash] opts the optional parameters
     # @return [nil]
     def get_agent(runmode, name, opts = {})
       get_agent_with_http_info(runmode, name, opts)
-      return nil
+      nil
     end
 
-    # 
-    # 
-    # @param runmode 
-    # @param name 
+    # @param runmode [String] 
+    # @param name [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def get_agent_with_http_info(runmode, name, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.get_agent ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.get_agent ...'
       end
       # verify the required parameter 'runmode' is set
       if @api_client.config.client_side_validation && runmode.nil?
@@ -166,107 +169,116 @@ module SwaggerAemClient
         fail ArgumentError, "Missing the required parameter 'name' when calling SlingApi.get_agent"
       end
       # resource path
-      local_var_path = "/etc/replication/agents.{runmode}/{name}".sub('{' + 'runmode' + '}', runmode.to_s).sub('{' + 'name' + '}', name.to_s)
+      local_var_path = '/etc/replication/agents.{runmode}/{name}'.sub('{' + 'runmode' + '}', CGI.escape(runmode.to_s)).sub('{' + 'name' + '}', CGI.escape(name.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
+      header_params = opts[:header_params] || {}
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#get_agent\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
-    # @param runmode 
+    # @param runmode [String] 
     # @param [Hash] opts the optional parameters
     # @return [String]
     def get_agents(runmode, opts = {})
       data, _status_code, _headers = get_agents_with_http_info(runmode, opts)
-      return data
+      data
     end
 
-    # 
-    # 
-    # @param runmode 
+    # @param runmode [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(String, Fixnum, Hash)>] String data, response status code and response headers
+    # @return [Array<(String, Integer, Hash)>] String data, response status code and response headers
     def get_agents_with_http_info(runmode, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.get_agents ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.get_agents ...'
       end
       # verify the required parameter 'runmode' is set
       if @api_client.config.client_side_validation && runmode.nil?
         fail ArgumentError, "Missing the required parameter 'runmode' when calling SlingApi.get_agents"
       end
       # resource path
-      local_var_path = "/etc/replication/agents.{runmode}.-1.json".sub('{' + 'runmode' + '}', runmode.to_s)
+      local_var_path = '/etc/replication/agents.{runmode}.-1.json'.sub('{' + 'runmode' + '}', CGI.escape(runmode.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'String' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'String')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#get_agents\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
-    # @param intermediate_path 
-    # @param authorizable_id 
+    # @param intermediate_path [String] 
+    # @param authorizable_id [String] 
     # @param [Hash] opts the optional parameters
     # @return [KeystoreInfo]
     def get_authorizable_keystore(intermediate_path, authorizable_id, opts = {})
       data, _status_code, _headers = get_authorizable_keystore_with_http_info(intermediate_path, authorizable_id, opts)
-      return data
+      data
     end
 
-    # 
-    # 
-    # @param intermediate_path 
-    # @param authorizable_id 
+    # @param intermediate_path [String] 
+    # @param authorizable_id [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(KeystoreInfo, Fixnum, Hash)>] KeystoreInfo data, response status code and response headers
+    # @return [Array<(KeystoreInfo, Integer, Hash)>] KeystoreInfo data, response status code and response headers
     def get_authorizable_keystore_with_http_info(intermediate_path, authorizable_id, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.get_authorizable_keystore ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.get_authorizable_keystore ...'
       end
       # verify the required parameter 'intermediate_path' is set
       if @api_client.config.client_side_validation && intermediate_path.nil?
@@ -277,55 +289,60 @@ module SwaggerAemClient
         fail ArgumentError, "Missing the required parameter 'authorizable_id' when calling SlingApi.get_authorizable_keystore"
       end
       # resource path
-      local_var_path = "/{intermediatePath}/{authorizableId}.ks.json".sub('{' + 'intermediatePath' + '}', intermediate_path.to_s).sub('{' + 'authorizableId' + '}', authorizable_id.to_s)
+      local_var_path = '/{intermediatePath}/{authorizableId}.ks.json'.sub('{' + 'intermediatePath' + '}', CGI.escape(intermediate_path.to_s)).sub('{' + 'authorizableId' + '}', CGI.escape(authorizable_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'KeystoreInfo' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'KeystoreInfo')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#get_authorizable_keystore\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
-    # @param intermediate_path 
-    # @param authorizable_id 
+    # @param intermediate_path [String] 
+    # @param authorizable_id [String] 
     # @param [Hash] opts the optional parameters
     # @return [File]
     def get_keystore(intermediate_path, authorizable_id, opts = {})
       data, _status_code, _headers = get_keystore_with_http_info(intermediate_path, authorizable_id, opts)
-      return data
+      data
     end
 
-    # 
-    # 
-    # @param intermediate_path 
-    # @param authorizable_id 
+    # @param intermediate_path [String] 
+    # @param authorizable_id [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(File, Fixnum, Hash)>] File data, response status code and response headers
+    # @return [Array<(File, Integer, Hash)>] File data, response status code and response headers
     def get_keystore_with_http_info(intermediate_path, authorizable_id, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.get_keystore ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.get_keystore ...'
       end
       # verify the required parameter 'intermediate_path' is set
       if @api_client.config.client_side_validation && intermediate_path.nil?
@@ -336,55 +353,60 @@ module SwaggerAemClient
         fail ArgumentError, "Missing the required parameter 'authorizable_id' when calling SlingApi.get_keystore"
       end
       # resource path
-      local_var_path = "/{intermediatePath}/{authorizableId}/keystore/store.p12".sub('{' + 'intermediatePath' + '}', intermediate_path.to_s).sub('{' + 'authorizableId' + '}', authorizable_id.to_s)
+      local_var_path = '/{intermediatePath}/{authorizableId}/keystore/store.p12'.sub('{' + 'intermediatePath' + '}', CGI.escape(intermediate_path.to_s)).sub('{' + 'authorizableId' + '}', CGI.escape(authorizable_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/octet-stream'])
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'File' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'File')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#get_keystore\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
-    # @param path 
-    # @param name 
+    # @param path [String] 
+    # @param name [String] 
     # @param [Hash] opts the optional parameters
     # @return [nil]
     def get_node(path, name, opts = {})
       get_node_with_http_info(path, name, opts)
-      return nil
+      nil
     end
 
-    # 
-    # 
-    # @param path 
-    # @param name 
+    # @param path [String] 
+    # @param name [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def get_node_with_http_info(path, name, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.get_node ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.get_node ...'
       end
       # verify the required parameter 'path' is set
       if @api_client.config.client_side_validation && path.nil?
@@ -395,56 +417,60 @@ module SwaggerAemClient
         fail ArgumentError, "Missing the required parameter 'name' when calling SlingApi.get_node"
       end
       # resource path
-      local_var_path = "/{path}/{name}".sub('{' + 'path' + '}', path.to_s).sub('{' + 'name' + '}', name.to_s)
+      local_var_path = '/{path}/{name}'.sub('{' + 'path' + '}', CGI.escape(path.to_s)).sub('{' + 'name' + '}', CGI.escape(name.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
+      header_params = opts[:header_params] || {}
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#get_node\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
-    # @param group 
-    # @param name 
-    # @param version 
+    # @param group [String] 
+    # @param name [String] 
+    # @param version [String] 
     # @param [Hash] opts the optional parameters
     # @return [File]
     def get_package(group, name, version, opts = {})
       data, _status_code, _headers = get_package_with_http_info(group, name, version, opts)
-      return data
+      data
     end
 
-    # 
-    # 
-    # @param group 
-    # @param name 
-    # @param version 
+    # @param group [String] 
+    # @param name [String] 
+    # @param version [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(File, Fixnum, Hash)>] File data, response status code and response headers
+    # @return [Array<(File, Integer, Hash)>] File data, response status code and response headers
     def get_package_with_http_info(group, name, version, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.get_package ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.get_package ...'
       end
       # verify the required parameter 'group' is set
       if @api_client.config.client_side_validation && group.nil?
@@ -459,57 +485,62 @@ module SwaggerAemClient
         fail ArgumentError, "Missing the required parameter 'version' when calling SlingApi.get_package"
       end
       # resource path
-      local_var_path = "/etc/packages/{group}/{name}-{version}.zip".sub('{' + 'group' + '}', group.to_s).sub('{' + 'name' + '}', name.to_s).sub('{' + 'version' + '}', version.to_s)
+      local_var_path = '/etc/packages/{group}/{name}-{version}.zip'.sub('{' + 'group' + '}', CGI.escape(group.to_s)).sub('{' + 'name' + '}', CGI.escape(name.to_s)).sub('{' + 'version' + '}', CGI.escape(version.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/octet-stream'])
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'File' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'File')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#get_package\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
-    # @param group 
-    # @param name 
-    # @param version 
+    # @param group [String] 
+    # @param name [String] 
+    # @param version [String] 
     # @param [Hash] opts the optional parameters
     # @return [String]
     def get_package_filter(group, name, version, opts = {})
       data, _status_code, _headers = get_package_filter_with_http_info(group, name, version, opts)
-      return data
+      data
     end
 
-    # 
-    # 
-    # @param group 
-    # @param name 
-    # @param version 
+    # @param group [String] 
+    # @param name [String] 
+    # @param version [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(String, Fixnum, Hash)>] String data, response status code and response headers
+    # @return [Array<(String, Integer, Hash)>] String data, response status code and response headers
     def get_package_filter_with_http_info(group, name, version, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.get_package_filter ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.get_package_filter ...'
       end
       # verify the required parameter 'group' is set
       if @api_client.config.client_side_validation && group.nil?
@@ -524,59 +555,64 @@ module SwaggerAemClient
         fail ArgumentError, "Missing the required parameter 'version' when calling SlingApi.get_package_filter"
       end
       # resource path
-      local_var_path = "/etc/packages/{group}/{name}-{version}.zip/jcr:content/vlt:definition/filter.tidy.2.json".sub('{' + 'group' + '}', group.to_s).sub('{' + 'name' + '}', name.to_s).sub('{' + 'version' + '}', version.to_s)
+      local_var_path = '/etc/packages/{group}/{name}-{version}.zip/jcr:content/vlt:definition/filter.tidy.2.json'.sub('{' + 'group' + '}', CGI.escape(group.to_s)).sub('{' + 'name' + '}', CGI.escape(name.to_s)).sub('{' + 'version' + '}', CGI.escape(version.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'String' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'String')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#get_package_filter\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
-    # @param path 
-    # @param p_limit 
-    # @param _1_property 
-    # @param _1_property_value 
+    # @param path [String] 
+    # @param p_limit [Float] 
+    # @param _1_property [String] 
+    # @param _1_property_value [String] 
     # @param [Hash] opts the optional parameters
     # @return [String]
     def get_query(path, p_limit, _1_property, _1_property_value, opts = {})
       data, _status_code, _headers = get_query_with_http_info(path, p_limit, _1_property, _1_property_value, opts)
-      return data
+      data
     end
 
-    # 
-    # 
-    # @param path 
-    # @param p_limit 
-    # @param _1_property 
-    # @param _1_property_value 
+    # @param path [String] 
+    # @param p_limit [Float] 
+    # @param _1_property [String] 
+    # @param _1_property_value [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(String, Fixnum, Hash)>] String data, response status code and response headers
+    # @return [Array<(String, Integer, Hash)>] String data, response status code and response headers
     def get_query_with_http_info(path, p_limit, _1_property, _1_property_value, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.get_query ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.get_query ...'
       end
       # verify the required parameter 'path' is set
       if @api_client.config.client_side_validation && path.nil?
@@ -595,253 +631,268 @@ module SwaggerAemClient
         fail ArgumentError, "Missing the required parameter '_1_property_value' when calling SlingApi.get_query"
       end
       # resource path
-      local_var_path = "/bin/querybuilder.json"
+      local_var_path = '/bin/querybuilder.json'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'path'] = path
       query_params[:'p.limit'] = p_limit
       query_params[:'1_property'] = _1_property
       query_params[:'1_property.value'] = _1_property_value
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'String' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'String')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#get_query\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @return [File]
     def get_truststore(opts = {})
       data, _status_code, _headers = get_truststore_with_http_info(opts)
-      return data
+      data
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(File, Fixnum, Hash)>] File data, response status code and response headers
+    # @return [Array<(File, Integer, Hash)>] File data, response status code and response headers
     def get_truststore_with_http_info(opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.get_truststore ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.get_truststore ...'
       end
       # resource path
-      local_var_path = "/etc/truststore/truststore.p12"
+      local_var_path = '/etc/truststore/truststore.p12'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/octet-stream'])
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'File' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'File')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#get_truststore\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @return [TruststoreInfo]
     def get_truststore_info(opts = {})
       data, _status_code, _headers = get_truststore_info_with_http_info(opts)
-      return data
+      data
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(TruststoreInfo, Fixnum, Hash)>] TruststoreInfo data, response status code and response headers
+    # @return [Array<(TruststoreInfo, Integer, Hash)>] TruststoreInfo data, response status code and response headers
     def get_truststore_info_with_http_info(opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.get_truststore_info ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.get_truststore_info ...'
       end
       # resource path
-      local_var_path = "/libs/granite/security/truststore.json"
+      local_var_path = '/libs/granite/security/truststore.json'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'TruststoreInfo' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'TruststoreInfo')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#get_truststore_info\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
-    # @param runmode 
-    # @param name 
+    # @param runmode [String] 
+    # @param name [String] 
     # @param [Hash] opts the optional parameters
-    # @option opts [BOOLEAN] :jcrcontentcqdistribute 
-    # @option opts [String] :jcrcontentcqdistribute_type_hint 
-    # @option opts [String] :jcrcontentcqname 
-    # @option opts [String] :jcrcontentcqtemplate 
-    # @option opts [BOOLEAN] :jcrcontentenabled 
-    # @option opts [String] :jcrcontentjcrdescription 
-    # @option opts [String] :jcrcontentjcrlast_modified 
-    # @option opts [String] :jcrcontentjcrlast_modified_by 
-    # @option opts [String] :jcrcontentjcrmixin_types 
-    # @option opts [String] :jcrcontentjcrtitle 
-    # @option opts [String] :jcrcontentlog_level 
-    # @option opts [BOOLEAN] :jcrcontentno_status_update 
-    # @option opts [BOOLEAN] :jcrcontentno_versioning 
-    # @option opts [Float] :jcrcontentprotocol_connect_timeout 
-    # @option opts [BOOLEAN] :jcrcontentprotocol_http_connection_closed 
-    # @option opts [String] :jcrcontentprotocol_http_expired 
-    # @option opts [Array<String>] :jcrcontentprotocol_http_headers 
-    # @option opts [String] :jcrcontentprotocol_http_headers_type_hint 
-    # @option opts [String] :jcrcontentprotocol_http_method 
-    # @option opts [BOOLEAN] :jcrcontentprotocol_https_relaxed 
-    # @option opts [String] :jcrcontentprotocol_interface 
-    # @option opts [Float] :jcrcontentprotocol_socket_timeout 
-    # @option opts [String] :jcrcontentprotocol_version 
-    # @option opts [String] :jcrcontentproxy_ntlm_domain 
-    # @option opts [String] :jcrcontentproxy_ntlm_host 
-    # @option opts [String] :jcrcontentproxy_host 
-    # @option opts [String] :jcrcontentproxy_password 
-    # @option opts [Float] :jcrcontentproxy_port 
-    # @option opts [String] :jcrcontentproxy_user 
-    # @option opts [Float] :jcrcontentqueue_batch_max_size 
-    # @option opts [String] :jcrcontentqueue_batch_mode 
-    # @option opts [Float] :jcrcontentqueue_batch_wait_time 
-    # @option opts [String] :jcrcontentretry_delay 
-    # @option opts [BOOLEAN] :jcrcontentreverse_replication 
-    # @option opts [String] :jcrcontentserialization_type 
-    # @option opts [String] :jcrcontentslingresource_type 
-    # @option opts [String] :jcrcontentssl 
-    # @option opts [String] :jcrcontenttransport_ntlm_domain 
-    # @option opts [String] :jcrcontenttransport_ntlm_host 
-    # @option opts [String] :jcrcontenttransport_password 
-    # @option opts [String] :jcrcontenttransport_uri 
-    # @option opts [String] :jcrcontenttransport_user 
-    # @option opts [BOOLEAN] :jcrcontenttrigger_distribute 
-    # @option opts [BOOLEAN] :jcrcontenttrigger_modified 
-    # @option opts [BOOLEAN] :jcrcontenttrigger_on_off_time 
-    # @option opts [BOOLEAN] :jcrcontenttrigger_receive 
-    # @option opts [BOOLEAN] :jcrcontenttrigger_specific 
-    # @option opts [String] :jcrcontentuser_id 
+    # @option opts [Boolean] :jcrcontent_cqdistribute 
+    # @option opts [String] :jcrcontent_cqdistribute_type_hint 
+    # @option opts [String] :jcrcontent_cqname 
+    # @option opts [String] :jcrcontent_cqtemplate 
+    # @option opts [Boolean] :jcrcontent_enabled 
+    # @option opts [String] :jcrcontent_jcrdescription 
+    # @option opts [String] :jcrcontent_jcrlast_modified 
+    # @option opts [String] :jcrcontent_jcrlast_modified_by 
+    # @option opts [String] :jcrcontent_jcrmixin_types 
+    # @option opts [String] :jcrcontent_jcrtitle 
+    # @option opts [String] :jcrcontent_log_level 
+    # @option opts [Boolean] :jcrcontent_no_status_update 
+    # @option opts [Boolean] :jcrcontent_no_versioning 
+    # @option opts [Float] :jcrcontent_protocol_connect_timeout 
+    # @option opts [Boolean] :jcrcontent_protocol_http_connection_closed 
+    # @option opts [String] :jcrcontent_protocol_http_expired 
+    # @option opts [Array<String>] :jcrcontent_protocol_http_headers 
+    # @option opts [String] :jcrcontent_protocol_http_headers_type_hint 
+    # @option opts [String] :jcrcontent_protocol_http_method 
+    # @option opts [Boolean] :jcrcontent_protocol_https_relaxed 
+    # @option opts [String] :jcrcontent_protocol_interface 
+    # @option opts [Float] :jcrcontent_protocol_socket_timeout 
+    # @option opts [String] :jcrcontent_protocol_version 
+    # @option opts [String] :jcrcontent_proxy_ntlm_domain 
+    # @option opts [String] :jcrcontent_proxy_ntlm_host 
+    # @option opts [String] :jcrcontent_proxy_host 
+    # @option opts [String] :jcrcontent_proxy_password 
+    # @option opts [Float] :jcrcontent_proxy_port 
+    # @option opts [String] :jcrcontent_proxy_user 
+    # @option opts [Float] :jcrcontent_queue_batch_max_size 
+    # @option opts [String] :jcrcontent_queue_batch_mode 
+    # @option opts [Float] :jcrcontent_queue_batch_wait_time 
+    # @option opts [String] :jcrcontent_retry_delay 
+    # @option opts [Boolean] :jcrcontent_reverse_replication 
+    # @option opts [String] :jcrcontent_serialization_type 
+    # @option opts [String] :jcrcontent_slingresource_type 
+    # @option opts [String] :jcrcontent_ssl 
+    # @option opts [String] :jcrcontent_transport_ntlm_domain 
+    # @option opts [String] :jcrcontent_transport_ntlm_host 
+    # @option opts [String] :jcrcontent_transport_password 
+    # @option opts [String] :jcrcontent_transport_uri 
+    # @option opts [String] :jcrcontent_transport_user 
+    # @option opts [Boolean] :jcrcontent_trigger_distribute 
+    # @option opts [Boolean] :jcrcontent_trigger_modified 
+    # @option opts [Boolean] :jcrcontent_trigger_on_off_time 
+    # @option opts [Boolean] :jcrcontent_trigger_receive 
+    # @option opts [Boolean] :jcrcontent_trigger_specific 
+    # @option opts [String] :jcrcontent_user_id 
     # @option opts [String] :jcrprimary_type 
     # @option opts [String] :operation 
     # @return [nil]
     def post_agent(runmode, name, opts = {})
       post_agent_with_http_info(runmode, name, opts)
-      return nil
+      nil
     end
 
-    # 
-    # 
-    # @param runmode 
-    # @param name 
+    # @param runmode [String] 
+    # @param name [String] 
     # @param [Hash] opts the optional parameters
-    # @option opts [BOOLEAN] :jcrcontentcqdistribute 
-    # @option opts [String] :jcrcontentcqdistribute_type_hint 
-    # @option opts [String] :jcrcontentcqname 
-    # @option opts [String] :jcrcontentcqtemplate 
-    # @option opts [BOOLEAN] :jcrcontentenabled 
-    # @option opts [String] :jcrcontentjcrdescription 
-    # @option opts [String] :jcrcontentjcrlast_modified 
-    # @option opts [String] :jcrcontentjcrlast_modified_by 
-    # @option opts [String] :jcrcontentjcrmixin_types 
-    # @option opts [String] :jcrcontentjcrtitle 
-    # @option opts [String] :jcrcontentlog_level 
-    # @option opts [BOOLEAN] :jcrcontentno_status_update 
-    # @option opts [BOOLEAN] :jcrcontentno_versioning 
-    # @option opts [Float] :jcrcontentprotocol_connect_timeout 
-    # @option opts [BOOLEAN] :jcrcontentprotocol_http_connection_closed 
-    # @option opts [String] :jcrcontentprotocol_http_expired 
-    # @option opts [Array<String>] :jcrcontentprotocol_http_headers 
-    # @option opts [String] :jcrcontentprotocol_http_headers_type_hint 
-    # @option opts [String] :jcrcontentprotocol_http_method 
-    # @option opts [BOOLEAN] :jcrcontentprotocol_https_relaxed 
-    # @option opts [String] :jcrcontentprotocol_interface 
-    # @option opts [Float] :jcrcontentprotocol_socket_timeout 
-    # @option opts [String] :jcrcontentprotocol_version 
-    # @option opts [String] :jcrcontentproxy_ntlm_domain 
-    # @option opts [String] :jcrcontentproxy_ntlm_host 
-    # @option opts [String] :jcrcontentproxy_host 
-    # @option opts [String] :jcrcontentproxy_password 
-    # @option opts [Float] :jcrcontentproxy_port 
-    # @option opts [String] :jcrcontentproxy_user 
-    # @option opts [Float] :jcrcontentqueue_batch_max_size 
-    # @option opts [String] :jcrcontentqueue_batch_mode 
-    # @option opts [Float] :jcrcontentqueue_batch_wait_time 
-    # @option opts [String] :jcrcontentretry_delay 
-    # @option opts [BOOLEAN] :jcrcontentreverse_replication 
-    # @option opts [String] :jcrcontentserialization_type 
-    # @option opts [String] :jcrcontentslingresource_type 
-    # @option opts [String] :jcrcontentssl 
-    # @option opts [String] :jcrcontenttransport_ntlm_domain 
-    # @option opts [String] :jcrcontenttransport_ntlm_host 
-    # @option opts [String] :jcrcontenttransport_password 
-    # @option opts [String] :jcrcontenttransport_uri 
-    # @option opts [String] :jcrcontenttransport_user 
-    # @option opts [BOOLEAN] :jcrcontenttrigger_distribute 
-    # @option opts [BOOLEAN] :jcrcontenttrigger_modified 
-    # @option opts [BOOLEAN] :jcrcontenttrigger_on_off_time 
-    # @option opts [BOOLEAN] :jcrcontenttrigger_receive 
-    # @option opts [BOOLEAN] :jcrcontenttrigger_specific 
-    # @option opts [String] :jcrcontentuser_id 
+    # @option opts [Boolean] :jcrcontent_cqdistribute 
+    # @option opts [String] :jcrcontent_cqdistribute_type_hint 
+    # @option opts [String] :jcrcontent_cqname 
+    # @option opts [String] :jcrcontent_cqtemplate 
+    # @option opts [Boolean] :jcrcontent_enabled 
+    # @option opts [String] :jcrcontent_jcrdescription 
+    # @option opts [String] :jcrcontent_jcrlast_modified 
+    # @option opts [String] :jcrcontent_jcrlast_modified_by 
+    # @option opts [String] :jcrcontent_jcrmixin_types 
+    # @option opts [String] :jcrcontent_jcrtitle 
+    # @option opts [String] :jcrcontent_log_level 
+    # @option opts [Boolean] :jcrcontent_no_status_update 
+    # @option opts [Boolean] :jcrcontent_no_versioning 
+    # @option opts [Float] :jcrcontent_protocol_connect_timeout 
+    # @option opts [Boolean] :jcrcontent_protocol_http_connection_closed 
+    # @option opts [String] :jcrcontent_protocol_http_expired 
+    # @option opts [Array<String>] :jcrcontent_protocol_http_headers 
+    # @option opts [String] :jcrcontent_protocol_http_headers_type_hint 
+    # @option opts [String] :jcrcontent_protocol_http_method 
+    # @option opts [Boolean] :jcrcontent_protocol_https_relaxed 
+    # @option opts [String] :jcrcontent_protocol_interface 
+    # @option opts [Float] :jcrcontent_protocol_socket_timeout 
+    # @option opts [String] :jcrcontent_protocol_version 
+    # @option opts [String] :jcrcontent_proxy_ntlm_domain 
+    # @option opts [String] :jcrcontent_proxy_ntlm_host 
+    # @option opts [String] :jcrcontent_proxy_host 
+    # @option opts [String] :jcrcontent_proxy_password 
+    # @option opts [Float] :jcrcontent_proxy_port 
+    # @option opts [String] :jcrcontent_proxy_user 
+    # @option opts [Float] :jcrcontent_queue_batch_max_size 
+    # @option opts [String] :jcrcontent_queue_batch_mode 
+    # @option opts [Float] :jcrcontent_queue_batch_wait_time 
+    # @option opts [String] :jcrcontent_retry_delay 
+    # @option opts [Boolean] :jcrcontent_reverse_replication 
+    # @option opts [String] :jcrcontent_serialization_type 
+    # @option opts [String] :jcrcontent_slingresource_type 
+    # @option opts [String] :jcrcontent_ssl 
+    # @option opts [String] :jcrcontent_transport_ntlm_domain 
+    # @option opts [String] :jcrcontent_transport_ntlm_host 
+    # @option opts [String] :jcrcontent_transport_password 
+    # @option opts [String] :jcrcontent_transport_uri 
+    # @option opts [String] :jcrcontent_transport_user 
+    # @option opts [Boolean] :jcrcontent_trigger_distribute 
+    # @option opts [Boolean] :jcrcontent_trigger_modified 
+    # @option opts [Boolean] :jcrcontent_trigger_on_off_time 
+    # @option opts [Boolean] :jcrcontent_trigger_receive 
+    # @option opts [Boolean] :jcrcontent_trigger_specific 
+    # @option opts [String] :jcrcontent_user_id 
     # @option opts [String] :jcrprimary_type 
     # @option opts [String] :operation 
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def post_agent_with_http_info(runmode, name, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.post_agent ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.post_agent ...'
       end
       # verify the required parameter 'runmode' is set
       if @api_client.config.client_side_validation && runmode.nil?
@@ -852,88 +903,94 @@ module SwaggerAemClient
         fail ArgumentError, "Missing the required parameter 'name' when calling SlingApi.post_agent"
       end
       # resource path
-      local_var_path = "/etc/replication/agents.{runmode}/{name}".sub('{' + 'runmode' + '}', runmode.to_s).sub('{' + 'name' + '}', name.to_s)
+      local_var_path = '/etc/replication/agents.{runmode}/{name}'.sub('{' + 'runmode' + '}', CGI.escape(runmode.to_s)).sub('{' + 'name' + '}', CGI.escape(name.to_s))
 
       # query parameters
-      query_params = {}
-      query_params[:'jcr:content/cq:distribute'] = opts[:'jcrcontentcqdistribute'] if !opts[:'jcrcontentcqdistribute'].nil?
-      query_params[:'jcr:content/cq:distribute@TypeHint'] = opts[:'jcrcontentcqdistribute_type_hint'] if !opts[:'jcrcontentcqdistribute_type_hint'].nil?
-      query_params[:'jcr:content/cq:name'] = opts[:'jcrcontentcqname'] if !opts[:'jcrcontentcqname'].nil?
-      query_params[:'jcr:content/cq:template'] = opts[:'jcrcontentcqtemplate'] if !opts[:'jcrcontentcqtemplate'].nil?
-      query_params[:'jcr:content/enabled'] = opts[:'jcrcontentenabled'] if !opts[:'jcrcontentenabled'].nil?
-      query_params[:'jcr:content/jcr:description'] = opts[:'jcrcontentjcrdescription'] if !opts[:'jcrcontentjcrdescription'].nil?
-      query_params[:'jcr:content/jcr:lastModified'] = opts[:'jcrcontentjcrlast_modified'] if !opts[:'jcrcontentjcrlast_modified'].nil?
-      query_params[:'jcr:content/jcr:lastModifiedBy'] = opts[:'jcrcontentjcrlast_modified_by'] if !opts[:'jcrcontentjcrlast_modified_by'].nil?
-      query_params[:'jcr:content/jcr:mixinTypes'] = opts[:'jcrcontentjcrmixin_types'] if !opts[:'jcrcontentjcrmixin_types'].nil?
-      query_params[:'jcr:content/jcr:title'] = opts[:'jcrcontentjcrtitle'] if !opts[:'jcrcontentjcrtitle'].nil?
-      query_params[:'jcr:content/logLevel'] = opts[:'jcrcontentlog_level'] if !opts[:'jcrcontentlog_level'].nil?
-      query_params[:'jcr:content/noStatusUpdate'] = opts[:'jcrcontentno_status_update'] if !opts[:'jcrcontentno_status_update'].nil?
-      query_params[:'jcr:content/noVersioning'] = opts[:'jcrcontentno_versioning'] if !opts[:'jcrcontentno_versioning'].nil?
-      query_params[:'jcr:content/protocolConnectTimeout'] = opts[:'jcrcontentprotocol_connect_timeout'] if !opts[:'jcrcontentprotocol_connect_timeout'].nil?
-      query_params[:'jcr:content/protocolHTTPConnectionClosed'] = opts[:'jcrcontentprotocol_http_connection_closed'] if !opts[:'jcrcontentprotocol_http_connection_closed'].nil?
-      query_params[:'jcr:content/protocolHTTPExpired'] = opts[:'jcrcontentprotocol_http_expired'] if !opts[:'jcrcontentprotocol_http_expired'].nil?
-      query_params[:'jcr:content/protocolHTTPHeaders'] = @api_client.build_collection_param(opts[:'jcrcontentprotocol_http_headers'], :multi) if !opts[:'jcrcontentprotocol_http_headers'].nil?
-      query_params[:'jcr:content/protocolHTTPHeaders@TypeHint'] = opts[:'jcrcontentprotocol_http_headers_type_hint'] if !opts[:'jcrcontentprotocol_http_headers_type_hint'].nil?
-      query_params[:'jcr:content/protocolHTTPMethod'] = opts[:'jcrcontentprotocol_http_method'] if !opts[:'jcrcontentprotocol_http_method'].nil?
-      query_params[:'jcr:content/protocolHTTPSRelaxed'] = opts[:'jcrcontentprotocol_https_relaxed'] if !opts[:'jcrcontentprotocol_https_relaxed'].nil?
-      query_params[:'jcr:content/protocolInterface'] = opts[:'jcrcontentprotocol_interface'] if !opts[:'jcrcontentprotocol_interface'].nil?
-      query_params[:'jcr:content/protocolSocketTimeout'] = opts[:'jcrcontentprotocol_socket_timeout'] if !opts[:'jcrcontentprotocol_socket_timeout'].nil?
-      query_params[:'jcr:content/protocolVersion'] = opts[:'jcrcontentprotocol_version'] if !opts[:'jcrcontentprotocol_version'].nil?
-      query_params[:'jcr:content/proxyNTLMDomain'] = opts[:'jcrcontentproxy_ntlm_domain'] if !opts[:'jcrcontentproxy_ntlm_domain'].nil?
-      query_params[:'jcr:content/proxyNTLMHost'] = opts[:'jcrcontentproxy_ntlm_host'] if !opts[:'jcrcontentproxy_ntlm_host'].nil?
-      query_params[:'jcr:content/proxyHost'] = opts[:'jcrcontentproxy_host'] if !opts[:'jcrcontentproxy_host'].nil?
-      query_params[:'jcr:content/proxyPassword'] = opts[:'jcrcontentproxy_password'] if !opts[:'jcrcontentproxy_password'].nil?
-      query_params[:'jcr:content/proxyPort'] = opts[:'jcrcontentproxy_port'] if !opts[:'jcrcontentproxy_port'].nil?
-      query_params[:'jcr:content/proxyUser'] = opts[:'jcrcontentproxy_user'] if !opts[:'jcrcontentproxy_user'].nil?
-      query_params[:'jcr:content/queueBatchMaxSize'] = opts[:'jcrcontentqueue_batch_max_size'] if !opts[:'jcrcontentqueue_batch_max_size'].nil?
-      query_params[:'jcr:content/queueBatchMode'] = opts[:'jcrcontentqueue_batch_mode'] if !opts[:'jcrcontentqueue_batch_mode'].nil?
-      query_params[:'jcr:content/queueBatchWaitTime'] = opts[:'jcrcontentqueue_batch_wait_time'] if !opts[:'jcrcontentqueue_batch_wait_time'].nil?
-      query_params[:'jcr:content/retryDelay'] = opts[:'jcrcontentretry_delay'] if !opts[:'jcrcontentretry_delay'].nil?
-      query_params[:'jcr:content/reverseReplication'] = opts[:'jcrcontentreverse_replication'] if !opts[:'jcrcontentreverse_replication'].nil?
-      query_params[:'jcr:content/serializationType'] = opts[:'jcrcontentserialization_type'] if !opts[:'jcrcontentserialization_type'].nil?
-      query_params[:'jcr:content/sling:resourceType'] = opts[:'jcrcontentslingresource_type'] if !opts[:'jcrcontentslingresource_type'].nil?
-      query_params[:'jcr:content/ssl'] = opts[:'jcrcontentssl'] if !opts[:'jcrcontentssl'].nil?
-      query_params[:'jcr:content/transportNTLMDomain'] = opts[:'jcrcontenttransport_ntlm_domain'] if !opts[:'jcrcontenttransport_ntlm_domain'].nil?
-      query_params[:'jcr:content/transportNTLMHost'] = opts[:'jcrcontenttransport_ntlm_host'] if !opts[:'jcrcontenttransport_ntlm_host'].nil?
-      query_params[:'jcr:content/transportPassword'] = opts[:'jcrcontenttransport_password'] if !opts[:'jcrcontenttransport_password'].nil?
-      query_params[:'jcr:content/transportUri'] = opts[:'jcrcontenttransport_uri'] if !opts[:'jcrcontenttransport_uri'].nil?
-      query_params[:'jcr:content/transportUser'] = opts[:'jcrcontenttransport_user'] if !opts[:'jcrcontenttransport_user'].nil?
-      query_params[:'jcr:content/triggerDistribute'] = opts[:'jcrcontenttrigger_distribute'] if !opts[:'jcrcontenttrigger_distribute'].nil?
-      query_params[:'jcr:content/triggerModified'] = opts[:'jcrcontenttrigger_modified'] if !opts[:'jcrcontenttrigger_modified'].nil?
-      query_params[:'jcr:content/triggerOnOffTime'] = opts[:'jcrcontenttrigger_on_off_time'] if !opts[:'jcrcontenttrigger_on_off_time'].nil?
-      query_params[:'jcr:content/triggerReceive'] = opts[:'jcrcontenttrigger_receive'] if !opts[:'jcrcontenttrigger_receive'].nil?
-      query_params[:'jcr:content/triggerSpecific'] = opts[:'jcrcontenttrigger_specific'] if !opts[:'jcrcontenttrigger_specific'].nil?
-      query_params[:'jcr:content/userId'] = opts[:'jcrcontentuser_id'] if !opts[:'jcrcontentuser_id'].nil?
+      query_params = opts[:query_params] || {}
+      query_params[:'jcr:content/cq:distribute'] = opts[:'jcrcontent_cqdistribute'] if !opts[:'jcrcontent_cqdistribute'].nil?
+      query_params[:'jcr:content/cq:distribute@TypeHint'] = opts[:'jcrcontent_cqdistribute_type_hint'] if !opts[:'jcrcontent_cqdistribute_type_hint'].nil?
+      query_params[:'jcr:content/cq:name'] = opts[:'jcrcontent_cqname'] if !opts[:'jcrcontent_cqname'].nil?
+      query_params[:'jcr:content/cq:template'] = opts[:'jcrcontent_cqtemplate'] if !opts[:'jcrcontent_cqtemplate'].nil?
+      query_params[:'jcr:content/enabled'] = opts[:'jcrcontent_enabled'] if !opts[:'jcrcontent_enabled'].nil?
+      query_params[:'jcr:content/jcr:description'] = opts[:'jcrcontent_jcrdescription'] if !opts[:'jcrcontent_jcrdescription'].nil?
+      query_params[:'jcr:content/jcr:lastModified'] = opts[:'jcrcontent_jcrlast_modified'] if !opts[:'jcrcontent_jcrlast_modified'].nil?
+      query_params[:'jcr:content/jcr:lastModifiedBy'] = opts[:'jcrcontent_jcrlast_modified_by'] if !opts[:'jcrcontent_jcrlast_modified_by'].nil?
+      query_params[:'jcr:content/jcr:mixinTypes'] = opts[:'jcrcontent_jcrmixin_types'] if !opts[:'jcrcontent_jcrmixin_types'].nil?
+      query_params[:'jcr:content/jcr:title'] = opts[:'jcrcontent_jcrtitle'] if !opts[:'jcrcontent_jcrtitle'].nil?
+      query_params[:'jcr:content/logLevel'] = opts[:'jcrcontent_log_level'] if !opts[:'jcrcontent_log_level'].nil?
+      query_params[:'jcr:content/noStatusUpdate'] = opts[:'jcrcontent_no_status_update'] if !opts[:'jcrcontent_no_status_update'].nil?
+      query_params[:'jcr:content/noVersioning'] = opts[:'jcrcontent_no_versioning'] if !opts[:'jcrcontent_no_versioning'].nil?
+      query_params[:'jcr:content/protocolConnectTimeout'] = opts[:'jcrcontent_protocol_connect_timeout'] if !opts[:'jcrcontent_protocol_connect_timeout'].nil?
+      query_params[:'jcr:content/protocolHTTPConnectionClosed'] = opts[:'jcrcontent_protocol_http_connection_closed'] if !opts[:'jcrcontent_protocol_http_connection_closed'].nil?
+      query_params[:'jcr:content/protocolHTTPExpired'] = opts[:'jcrcontent_protocol_http_expired'] if !opts[:'jcrcontent_protocol_http_expired'].nil?
+      query_params[:'jcr:content/protocolHTTPHeaders'] = @api_client.build_collection_param(opts[:'jcrcontent_protocol_http_headers'], :multi) if !opts[:'jcrcontent_protocol_http_headers'].nil?
+      query_params[:'jcr:content/protocolHTTPHeaders@TypeHint'] = opts[:'jcrcontent_protocol_http_headers_type_hint'] if !opts[:'jcrcontent_protocol_http_headers_type_hint'].nil?
+      query_params[:'jcr:content/protocolHTTPMethod'] = opts[:'jcrcontent_protocol_http_method'] if !opts[:'jcrcontent_protocol_http_method'].nil?
+      query_params[:'jcr:content/protocolHTTPSRelaxed'] = opts[:'jcrcontent_protocol_https_relaxed'] if !opts[:'jcrcontent_protocol_https_relaxed'].nil?
+      query_params[:'jcr:content/protocolInterface'] = opts[:'jcrcontent_protocol_interface'] if !opts[:'jcrcontent_protocol_interface'].nil?
+      query_params[:'jcr:content/protocolSocketTimeout'] = opts[:'jcrcontent_protocol_socket_timeout'] if !opts[:'jcrcontent_protocol_socket_timeout'].nil?
+      query_params[:'jcr:content/protocolVersion'] = opts[:'jcrcontent_protocol_version'] if !opts[:'jcrcontent_protocol_version'].nil?
+      query_params[:'jcr:content/proxyNTLMDomain'] = opts[:'jcrcontent_proxy_ntlm_domain'] if !opts[:'jcrcontent_proxy_ntlm_domain'].nil?
+      query_params[:'jcr:content/proxyNTLMHost'] = opts[:'jcrcontent_proxy_ntlm_host'] if !opts[:'jcrcontent_proxy_ntlm_host'].nil?
+      query_params[:'jcr:content/proxyHost'] = opts[:'jcrcontent_proxy_host'] if !opts[:'jcrcontent_proxy_host'].nil?
+      query_params[:'jcr:content/proxyPassword'] = opts[:'jcrcontent_proxy_password'] if !opts[:'jcrcontent_proxy_password'].nil?
+      query_params[:'jcr:content/proxyPort'] = opts[:'jcrcontent_proxy_port'] if !opts[:'jcrcontent_proxy_port'].nil?
+      query_params[:'jcr:content/proxyUser'] = opts[:'jcrcontent_proxy_user'] if !opts[:'jcrcontent_proxy_user'].nil?
+      query_params[:'jcr:content/queueBatchMaxSize'] = opts[:'jcrcontent_queue_batch_max_size'] if !opts[:'jcrcontent_queue_batch_max_size'].nil?
+      query_params[:'jcr:content/queueBatchMode'] = opts[:'jcrcontent_queue_batch_mode'] if !opts[:'jcrcontent_queue_batch_mode'].nil?
+      query_params[:'jcr:content/queueBatchWaitTime'] = opts[:'jcrcontent_queue_batch_wait_time'] if !opts[:'jcrcontent_queue_batch_wait_time'].nil?
+      query_params[:'jcr:content/retryDelay'] = opts[:'jcrcontent_retry_delay'] if !opts[:'jcrcontent_retry_delay'].nil?
+      query_params[:'jcr:content/reverseReplication'] = opts[:'jcrcontent_reverse_replication'] if !opts[:'jcrcontent_reverse_replication'].nil?
+      query_params[:'jcr:content/serializationType'] = opts[:'jcrcontent_serialization_type'] if !opts[:'jcrcontent_serialization_type'].nil?
+      query_params[:'jcr:content/sling:resourceType'] = opts[:'jcrcontent_slingresource_type'] if !opts[:'jcrcontent_slingresource_type'].nil?
+      query_params[:'jcr:content/ssl'] = opts[:'jcrcontent_ssl'] if !opts[:'jcrcontent_ssl'].nil?
+      query_params[:'jcr:content/transportNTLMDomain'] = opts[:'jcrcontent_transport_ntlm_domain'] if !opts[:'jcrcontent_transport_ntlm_domain'].nil?
+      query_params[:'jcr:content/transportNTLMHost'] = opts[:'jcrcontent_transport_ntlm_host'] if !opts[:'jcrcontent_transport_ntlm_host'].nil?
+      query_params[:'jcr:content/transportPassword'] = opts[:'jcrcontent_transport_password'] if !opts[:'jcrcontent_transport_password'].nil?
+      query_params[:'jcr:content/transportUri'] = opts[:'jcrcontent_transport_uri'] if !opts[:'jcrcontent_transport_uri'].nil?
+      query_params[:'jcr:content/transportUser'] = opts[:'jcrcontent_transport_user'] if !opts[:'jcrcontent_transport_user'].nil?
+      query_params[:'jcr:content/triggerDistribute'] = opts[:'jcrcontent_trigger_distribute'] if !opts[:'jcrcontent_trigger_distribute'].nil?
+      query_params[:'jcr:content/triggerModified'] = opts[:'jcrcontent_trigger_modified'] if !opts[:'jcrcontent_trigger_modified'].nil?
+      query_params[:'jcr:content/triggerOnOffTime'] = opts[:'jcrcontent_trigger_on_off_time'] if !opts[:'jcrcontent_trigger_on_off_time'].nil?
+      query_params[:'jcr:content/triggerReceive'] = opts[:'jcrcontent_trigger_receive'] if !opts[:'jcrcontent_trigger_receive'].nil?
+      query_params[:'jcr:content/triggerSpecific'] = opts[:'jcrcontent_trigger_specific'] if !opts[:'jcrcontent_trigger_specific'].nil?
+      query_params[:'jcr:content/userId'] = opts[:'jcrcontent_user_id'] if !opts[:'jcrcontent_user_id'].nil?
       query_params[:'jcr:primaryType'] = opts[:'jcrprimary_type'] if !opts[:'jcrprimary_type'].nil?
       query_params[:':operation'] = opts[:'operation'] if !opts[:'operation'].nil?
 
       # header parameters
-      header_params = {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
+      header_params = opts[:header_params] || {}
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#post_agent\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
-    # @param intermediate_path 
-    # @param authorizable_id 
+    # @param intermediate_path [String] 
+    # @param authorizable_id [String] 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :operation 
     # @option opts [String] :current_password 
@@ -950,13 +1007,11 @@ module SwaggerAemClient
     # @return [KeystoreInfo]
     def post_authorizable_keystore(intermediate_path, authorizable_id, opts = {})
       data, _status_code, _headers = post_authorizable_keystore_with_http_info(intermediate_path, authorizable_id, opts)
-      return data
+      data
     end
 
-    # 
-    # 
-    # @param intermediate_path 
-    # @param authorizable_id 
+    # @param intermediate_path [String] 
+    # @param authorizable_id [String] 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :operation 
     # @option opts [String] :current_password 
@@ -970,10 +1025,10 @@ module SwaggerAemClient
     # @option opts [File] :cert_chain 
     # @option opts [File] :pk 
     # @option opts [File] :key_store 
-    # @return [Array<(KeystoreInfo, Fixnum, Hash)>] KeystoreInfo data, response status code and response headers
+    # @return [Array<(KeystoreInfo, Integer, Hash)>] KeystoreInfo data, response status code and response headers
     def post_authorizable_keystore_with_http_info(intermediate_path, authorizable_id, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.post_authorizable_keystore ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.post_authorizable_keystore ...'
       end
       # verify the required parameter 'intermediate_path' is set
       if @api_client.config.client_side_validation && intermediate_path.nil?
@@ -984,10 +1039,10 @@ module SwaggerAemClient
         fail ArgumentError, "Missing the required parameter 'authorizable_id' when calling SlingApi.post_authorizable_keystore"
       end
       # resource path
-      local_var_path = "/{intermediatePath}/{authorizableId}.ks.html".sub('{' + 'intermediatePath' + '}', intermediate_path.to_s).sub('{' + 'authorizableId' + '}', authorizable_id.to_s)
+      local_var_path = '/{intermediatePath}/{authorizableId}.ks.html'.sub('{' + 'intermediatePath' + '}', CGI.escape(intermediate_path.to_s)).sub('{' + 'authorizableId' + '}', CGI.escape(authorizable_id.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:':operation'] = opts[:'operation'] if !opts[:'operation'].nil?
       query_params[:'currentPassword'] = opts[:'current_password'] if !opts[:'current_password'].nil?
       query_params[:'newPassword'] = opts[:'new_password'] if !opts[:'new_password'].nil?
@@ -999,62 +1054,67 @@ module SwaggerAemClient
       query_params[:'removeAlias'] = opts[:'remove_alias'] if !opts[:'remove_alias'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
       # HTTP header 'Content-Type'
       header_params['Content-Type'] = @api_client.select_header_content_type(['multipart/form-data'])
 
       # form parameters
-      form_params = {}
-      form_params["cert-chain"] = opts[:'cert_chain'] if !opts[:'cert_chain'].nil?
-      form_params["pk"] = opts[:'pk'] if !opts[:'pk'].nil?
-      form_params["keyStore"] = opts[:'key_store'] if !opts[:'key_store'].nil?
+      form_params = opts[:form_params] || {}
+      form_params['cert-chain'] = opts[:'cert_chain'] if !opts[:'cert_chain'].nil?
+      form_params['pk'] = opts[:'pk'] if !opts[:'pk'].nil?
+      form_params['keyStore'] = opts[:'key_store'] if !opts[:'key_store'].nil?
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'KeystoreInfo' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'KeystoreInfo')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#post_authorizable_keystore\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
-    # @param authorizable_id 
-    # @param intermediate_path 
+    # @param authorizable_id [String] 
+    # @param intermediate_path [String] 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :create_user 
     # @option opts [String] :create_group 
     # @option opts [String] :reppassword 
-    # @option opts [String] :profilegiven_name 
+    # @option opts [String] :profile_given_name 
     # @return [String]
     def post_authorizables(authorizable_id, intermediate_path, opts = {})
       data, _status_code, _headers = post_authorizables_with_http_info(authorizable_id, intermediate_path, opts)
-      return data
+      data
     end
 
-    # 
-    # 
-    # @param authorizable_id 
-    # @param intermediate_path 
+    # @param authorizable_id [String] 
+    # @param intermediate_path [String] 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :create_user 
     # @option opts [String] :create_group 
     # @option opts [String] :reppassword 
-    # @option opts [String] :profilegiven_name 
-    # @return [Array<(String, Fixnum, Hash)>] String data, response status code and response headers
+    # @option opts [String] :profile_given_name 
+    # @return [Array<(String, Integer, Hash)>] String data, response status code and response headers
     def post_authorizables_with_http_info(authorizable_id, intermediate_path, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.post_authorizables ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.post_authorizables ...'
       end
       # verify the required parameter 'authorizable_id' is set
       if @api_client.config.client_side_validation && authorizable_id.nil?
@@ -1065,51 +1125,58 @@ module SwaggerAemClient
         fail ArgumentError, "Missing the required parameter 'intermediate_path' when calling SlingApi.post_authorizables"
       end
       # resource path
-      local_var_path = "/libs/granite/security/post/authorizables"
+      local_var_path = '/libs/granite/security/post/authorizables'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'authorizableId'] = authorizable_id
       query_params[:'intermediatePath'] = intermediate_path
       query_params[:'createUser'] = opts[:'create_user'] if !opts[:'create_user'].nil?
       query_params[:'createGroup'] = opts[:'create_group'] if !opts[:'create_group'].nil?
       query_params[:'rep:password'] = opts[:'reppassword'] if !opts[:'reppassword'].nil?
-      query_params[:'profile/givenName'] = opts[:'profilegiven_name'] if !opts[:'profilegiven_name'].nil?
+      query_params[:'profile/givenName'] = opts[:'profile_given_name'] if !opts[:'profile_given_name'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['text/html'])
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'String' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'String')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#post_authorizables\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :key_store_password 
     # @option opts [String] :key_store_password_type_hint 
     # @option opts [Integer] :service_ranking 
     # @option opts [String] :service_ranking_type_hint 
-    # @option opts [BOOLEAN] :idp_http_redirect 
+    # @option opts [Boolean] :idp_http_redirect 
     # @option opts [String] :idp_http_redirect_type_hint 
-    # @option opts [BOOLEAN] :create_user 
+    # @option opts [Boolean] :create_user 
     # @option opts [String] :create_user_type_hint 
     # @option opts [String] :default_redirect_url 
     # @option opts [String] :default_redirect_url_type_hint 
@@ -1119,7 +1186,7 @@ module SwaggerAemClient
     # @option opts [String] :default_groups_type_hint 
     # @option opts [String] :idp_cert_alias 
     # @option opts [String] :idp_cert_alias_type_hint 
-    # @option opts [BOOLEAN] :add_group_memberships 
+    # @option opts [Boolean] :add_group_memberships 
     # @option opts [String] :add_group_memberships_type_hint 
     # @option opts [Array<String>] :path 
     # @option opts [String] :path_type_hint 
@@ -1137,11 +1204,11 @@ module SwaggerAemClient
     # @option opts [String] :service_provider_entity_id_type_hint 
     # @option opts [String] :assertion_consumer_service_url 
     # @option opts [String] :assertion_consumer_service_url_type_hint 
-    # @option opts [BOOLEAN] :handle_logout 
+    # @option opts [Boolean] :handle_logout 
     # @option opts [String] :handle_logout_type_hint 
     # @option opts [String] :sp_private_key_alias 
     # @option opts [String] :sp_private_key_alias_type_hint 
-    # @option opts [BOOLEAN] :use_encryption 
+    # @option opts [Boolean] :use_encryption 
     # @option opts [String] :use_encryption_type_hint 
     # @option opts [String] :name_id_format 
     # @option opts [String] :name_id_format_type_hint 
@@ -1154,19 +1221,17 @@ module SwaggerAemClient
     # @return [nil]
     def post_config_adobe_granite_saml_authentication_handler(opts = {})
       post_config_adobe_granite_saml_authentication_handler_with_http_info(opts)
-      return nil
+      nil
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :key_store_password 
     # @option opts [String] :key_store_password_type_hint 
     # @option opts [Integer] :service_ranking 
     # @option opts [String] :service_ranking_type_hint 
-    # @option opts [BOOLEAN] :idp_http_redirect 
+    # @option opts [Boolean] :idp_http_redirect 
     # @option opts [String] :idp_http_redirect_type_hint 
-    # @option opts [BOOLEAN] :create_user 
+    # @option opts [Boolean] :create_user 
     # @option opts [String] :create_user_type_hint 
     # @option opts [String] :default_redirect_url 
     # @option opts [String] :default_redirect_url_type_hint 
@@ -1176,7 +1241,7 @@ module SwaggerAemClient
     # @option opts [String] :default_groups_type_hint 
     # @option opts [String] :idp_cert_alias 
     # @option opts [String] :idp_cert_alias_type_hint 
-    # @option opts [BOOLEAN] :add_group_memberships 
+    # @option opts [Boolean] :add_group_memberships 
     # @option opts [String] :add_group_memberships_type_hint 
     # @option opts [Array<String>] :path 
     # @option opts [String] :path_type_hint 
@@ -1194,11 +1259,11 @@ module SwaggerAemClient
     # @option opts [String] :service_provider_entity_id_type_hint 
     # @option opts [String] :assertion_consumer_service_url 
     # @option opts [String] :assertion_consumer_service_url_type_hint 
-    # @option opts [BOOLEAN] :handle_logout 
+    # @option opts [Boolean] :handle_logout 
     # @option opts [String] :handle_logout_type_hint 
     # @option opts [String] :sp_private_key_alias 
     # @option opts [String] :sp_private_key_alias_type_hint 
-    # @option opts [BOOLEAN] :use_encryption 
+    # @option opts [Boolean] :use_encryption 
     # @option opts [String] :use_encryption_type_hint 
     # @option opts [String] :name_id_format 
     # @option opts [String] :name_id_format_type_hint 
@@ -1208,16 +1273,16 @@ module SwaggerAemClient
     # @option opts [String] :signature_method_type_hint 
     # @option opts [String] :user_intermediate_path 
     # @option opts [String] :user_intermediate_path_type_hint 
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def post_config_adobe_granite_saml_authentication_handler_with_http_info(opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.post_config_adobe_granite_saml_authentication_handler ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.post_config_adobe_granite_saml_authentication_handler ...'
       end
       # resource path
-      local_var_path = "/apps/system/config/com.adobe.granite.auth.saml.SamlAuthenticationHandler.config"
+      local_var_path = '/apps/system/config/com.adobe.granite.auth.saml.SamlAuthenticationHandler.config'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'keyStorePassword'] = opts[:'key_store_password'] if !opts[:'key_store_password'].nil?
       query_params[:'keyStorePassword@TypeHint'] = opts[:'key_store_password_type_hint'] if !opts[:'key_store_password_type_hint'].nil?
       query_params[:'service.ranking'] = opts[:'service_ranking'] if !opts[:'service_ranking'].nil?
@@ -1268,32 +1333,38 @@ module SwaggerAemClient
       query_params[:'userIntermediatePath@TypeHint'] = opts[:'user_intermediate_path_type_hint'] if !opts[:'user_intermediate_path_type_hint'].nil?
 
       # header parameters
-      header_params = {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
+      header_params = opts[:header_params] || {}
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#post_config_adobe_granite_saml_authentication_handler\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
-    # @option opts [BOOLEAN] :org_apache_felix_https_nio 
+    # @option opts [Boolean] :org_apache_felix_https_nio 
     # @option opts [String] :org_apache_felix_https_nio_type_hint 
     # @option opts [String] :org_apache_felix_https_keystore 
     # @option opts [String] :org_apache_felix_https_keystore_type_hint 
@@ -1309,20 +1380,18 @@ module SwaggerAemClient
     # @option opts [String] :org_apache_felix_https_truststore_password_type_hint 
     # @option opts [String] :org_apache_felix_https_clientcertificate 
     # @option opts [String] :org_apache_felix_https_clientcertificate_type_hint 
-    # @option opts [BOOLEAN] :org_apache_felix_https_enable 
+    # @option opts [Boolean] :org_apache_felix_https_enable 
     # @option opts [String] :org_apache_felix_https_enable_type_hint 
     # @option opts [String] :org_osgi_service_http_port_secure 
     # @option opts [String] :org_osgi_service_http_port_secure_type_hint 
     # @return [nil]
     def post_config_apache_felix_jetty_based_http_service(opts = {})
       post_config_apache_felix_jetty_based_http_service_with_http_info(opts)
-      return nil
+      nil
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
-    # @option opts [BOOLEAN] :org_apache_felix_https_nio 
+    # @option opts [Boolean] :org_apache_felix_https_nio 
     # @option opts [String] :org_apache_felix_https_nio_type_hint 
     # @option opts [String] :org_apache_felix_https_keystore 
     # @option opts [String] :org_apache_felix_https_keystore_type_hint 
@@ -1338,20 +1407,20 @@ module SwaggerAemClient
     # @option opts [String] :org_apache_felix_https_truststore_password_type_hint 
     # @option opts [String] :org_apache_felix_https_clientcertificate 
     # @option opts [String] :org_apache_felix_https_clientcertificate_type_hint 
-    # @option opts [BOOLEAN] :org_apache_felix_https_enable 
+    # @option opts [Boolean] :org_apache_felix_https_enable 
     # @option opts [String] :org_apache_felix_https_enable_type_hint 
     # @option opts [String] :org_osgi_service_http_port_secure 
     # @option opts [String] :org_osgi_service_http_port_secure_type_hint 
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def post_config_apache_felix_jetty_based_http_service_with_http_info(opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.post_config_apache_felix_jetty_based_http_service ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.post_config_apache_felix_jetty_based_http_service ...'
       end
       # resource path
-      local_var_path = "/apps/system/config/org.apache.felix.http"
+      local_var_path = '/apps/system/config/org.apache.felix.http'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'org.apache.felix.https.nio'] = opts[:'org_apache_felix_https_nio'] if !opts[:'org_apache_felix_https_nio'].nil?
       query_params[:'org.apache.felix.https.nio@TypeHint'] = opts[:'org_apache_felix_https_nio_type_hint'] if !opts[:'org_apache_felix_https_nio_type_hint'].nil?
       query_params[:'org.apache.felix.https.keystore'] = opts[:'org_apache_felix_https_keystore'] if !opts[:'org_apache_felix_https_keystore'].nil?
@@ -1374,30 +1443,36 @@ module SwaggerAemClient
       query_params[:'org.osgi.service.http.port.secure@TypeHint'] = opts[:'org_osgi_service_http_port_secure_type_hint'] if !opts[:'org_osgi_service_http_port_secure_type_hint'].nil?
 
       # header parameters
-      header_params = {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
+      header_params = opts[:header_params] || {}
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#post_config_apache_felix_jetty_based_http_service\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :proxy_host 
     # @option opts [String] :proxy_host_type_hint 
@@ -1405,7 +1480,7 @@ module SwaggerAemClient
     # @option opts [String] :proxy_port_type_hint 
     # @option opts [Array<String>] :proxy_exceptions 
     # @option opts [String] :proxy_exceptions_type_hint 
-    # @option opts [BOOLEAN] :proxy_enabled 
+    # @option opts [Boolean] :proxy_enabled 
     # @option opts [String] :proxy_enabled_type_hint 
     # @option opts [String] :proxy_user 
     # @option opts [String] :proxy_user_type_hint 
@@ -1414,11 +1489,9 @@ module SwaggerAemClient
     # @return [nil]
     def post_config_apache_http_components_proxy_configuration(opts = {})
       post_config_apache_http_components_proxy_configuration_with_http_info(opts)
-      return nil
+      nil
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :proxy_host 
     # @option opts [String] :proxy_host_type_hint 
@@ -1426,22 +1499,22 @@ module SwaggerAemClient
     # @option opts [String] :proxy_port_type_hint 
     # @option opts [Array<String>] :proxy_exceptions 
     # @option opts [String] :proxy_exceptions_type_hint 
-    # @option opts [BOOLEAN] :proxy_enabled 
+    # @option opts [Boolean] :proxy_enabled 
     # @option opts [String] :proxy_enabled_type_hint 
     # @option opts [String] :proxy_user 
     # @option opts [String] :proxy_user_type_hint 
     # @option opts [String] :proxy_password 
     # @option opts [String] :proxy_password_type_hint 
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def post_config_apache_http_components_proxy_configuration_with_http_info(opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.post_config_apache_http_components_proxy_configuration ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.post_config_apache_http_components_proxy_configuration ...'
       end
       # resource path
-      local_var_path = "/apps/system/config/org.apache.http.proxyconfigurator.config"
+      local_var_path = '/apps/system/config/org.apache.http.proxyconfigurator.config'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'proxy.host'] = opts[:'proxy_host'] if !opts[:'proxy_host'].nil?
       query_params[:'proxy.host@TypeHint'] = opts[:'proxy_host_type_hint'] if !opts[:'proxy_host_type_hint'].nil?
       query_params[:'proxy.port'] = opts[:'proxy_port'] if !opts[:'proxy_port'].nil?
@@ -1456,124 +1529,132 @@ module SwaggerAemClient
       query_params[:'proxy.password@TypeHint'] = opts[:'proxy_password_type_hint'] if !opts[:'proxy_password_type_hint'].nil?
 
       # header parameters
-      header_params = {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
+      header_params = opts[:header_params] || {}
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#post_config_apache_http_components_proxy_configuration\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :_alias 
     # @option opts [String] :alias_type_hint 
-    # @option opts [BOOLEAN] :dav_create_absolute_uri 
+    # @option opts [Boolean] :dav_create_absolute_uri 
     # @option opts [String] :dav_create_absolute_uri_type_hint 
     # @return [nil]
     def post_config_apache_sling_dav_ex_servlet(opts = {})
       post_config_apache_sling_dav_ex_servlet_with_http_info(opts)
-      return nil
+      nil
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :_alias 
     # @option opts [String] :alias_type_hint 
-    # @option opts [BOOLEAN] :dav_create_absolute_uri 
+    # @option opts [Boolean] :dav_create_absolute_uri 
     # @option opts [String] :dav_create_absolute_uri_type_hint 
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def post_config_apache_sling_dav_ex_servlet_with_http_info(opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.post_config_apache_sling_dav_ex_servlet ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.post_config_apache_sling_dav_ex_servlet ...'
       end
       # resource path
-      local_var_path = "/apps/system/config/org.apache.sling.jcr.davex.impl.servlets.SlingDavExServlet"
+      local_var_path = '/apps/system/config/org.apache.sling.jcr.davex.impl.servlets.SlingDavExServlet'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'alias'] = opts[:'_alias'] if !opts[:'_alias'].nil?
       query_params[:'alias@TypeHint'] = opts[:'alias_type_hint'] if !opts[:'alias_type_hint'].nil?
       query_params[:'dav.create-absolute-uri'] = opts[:'dav_create_absolute_uri'] if !opts[:'dav_create_absolute_uri'].nil?
       query_params[:'dav.create-absolute-uri@TypeHint'] = opts[:'dav_create_absolute_uri_type_hint'] if !opts[:'dav_create_absolute_uri_type_hint'].nil?
 
       # header parameters
-      header_params = {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
+      header_params = opts[:header_params] || {}
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#post_config_apache_sling_dav_ex_servlet\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :json_maximumresults 
     # @option opts [String] :json_maximumresults_type_hint 
-    # @option opts [BOOLEAN] :enable_html 
+    # @option opts [Boolean] :enable_html 
     # @option opts [String] :enable_html_type_hint 
-    # @option opts [BOOLEAN] :enable_txt 
+    # @option opts [Boolean] :enable_txt 
     # @option opts [String] :enable_txt_type_hint 
-    # @option opts [BOOLEAN] :enable_xml 
+    # @option opts [Boolean] :enable_xml 
     # @option opts [String] :enable_xml_type_hint 
     # @return [nil]
     def post_config_apache_sling_get_servlet(opts = {})
       post_config_apache_sling_get_servlet_with_http_info(opts)
-      return nil
+      nil
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :json_maximumresults 
     # @option opts [String] :json_maximumresults_type_hint 
-    # @option opts [BOOLEAN] :enable_html 
+    # @option opts [Boolean] :enable_html 
     # @option opts [String] :enable_html_type_hint 
-    # @option opts [BOOLEAN] :enable_txt 
+    # @option opts [Boolean] :enable_txt 
     # @option opts [String] :enable_txt_type_hint 
-    # @option opts [BOOLEAN] :enable_xml 
+    # @option opts [Boolean] :enable_xml 
     # @option opts [String] :enable_xml_type_hint 
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def post_config_apache_sling_get_servlet_with_http_info(opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.post_config_apache_sling_get_servlet ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.post_config_apache_sling_get_servlet ...'
       end
       # resource path
-      local_var_path = "/apps/system/config/org.apache.sling.servlets.get.DefaultGetServlet"
+      local_var_path = '/apps/system/config/org.apache.sling.servlets.get.DefaultGetServlet'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'json.maximumresults'] = opts[:'json_maximumresults'] if !opts[:'json_maximumresults'].nil?
       query_params[:'json.maximumresults@TypeHint'] = opts[:'json_maximumresults_type_hint'] if !opts[:'json_maximumresults_type_hint'].nil?
       query_params[:'enable.html'] = opts[:'enable_html'] if !opts[:'enable_html'].nil?
@@ -1584,32 +1665,38 @@ module SwaggerAemClient
       query_params[:'enable.xml@TypeHint'] = opts[:'enable_xml_type_hint'] if !opts[:'enable_xml_type_hint'].nil?
 
       # header parameters
-      header_params = {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
+      header_params = opts[:header_params] || {}
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#post_config_apache_sling_get_servlet\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
-    # @option opts [BOOLEAN] :allow_empty 
+    # @option opts [Boolean] :allow_empty 
     # @option opts [String] :allow_empty_type_hint 
     # @option opts [String] :allow_hosts 
     # @option opts [String] :allow_hosts_type_hint 
@@ -1620,13 +1707,11 @@ module SwaggerAemClient
     # @return [nil]
     def post_config_apache_sling_referrer_filter(opts = {})
       post_config_apache_sling_referrer_filter_with_http_info(opts)
-      return nil
+      nil
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
-    # @option opts [BOOLEAN] :allow_empty 
+    # @option opts [Boolean] :allow_empty 
     # @option opts [String] :allow_empty_type_hint 
     # @option opts [String] :allow_hosts 
     # @option opts [String] :allow_hosts_type_hint 
@@ -1634,16 +1719,16 @@ module SwaggerAemClient
     # @option opts [String] :allow_hosts_regexp_type_hint 
     # @option opts [String] :filter_methods 
     # @option opts [String] :filter_methods_type_hint 
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def post_config_apache_sling_referrer_filter_with_http_info(opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.post_config_apache_sling_referrer_filter ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.post_config_apache_sling_referrer_filter ...'
       end
       # resource path
-      local_var_path = "/apps/system/config/org.apache.sling.security.impl.ReferrerFilter"
+      local_var_path = '/apps/system/config/org.apache.sling.security.impl.ReferrerFilter'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'allow.empty'] = opts[:'allow_empty'] if !opts[:'allow_empty'].nil?
       query_params[:'allow.empty@TypeHint'] = opts[:'allow_empty_type_hint'] if !opts[:'allow_empty_type_hint'].nil?
       query_params[:'allow.hosts'] = opts[:'allow_hosts'] if !opts[:'allow_hosts'].nil?
@@ -1654,32 +1739,94 @@ module SwaggerAemClient
       query_params[:'filter.methods@TypeHint'] = opts[:'filter_methods_type_hint'] if !opts[:'filter_methods_type_hint'].nil?
 
       # header parameters
-      header_params = {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
+      header_params = opts[:header_params] || {}
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#post_config_apache_sling_referrer_filter\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
-    # @param path 
-    # @param name 
+    # @param config_node_name [String] 
+    # @param [Hash] opts the optional parameters
+    # @return [nil]
+    def post_config_property(config_node_name, opts = {})
+      post_config_property_with_http_info(config_node_name, opts)
+      nil
+    end
+
+    # @param config_node_name [String] 
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
+    def post_config_property_with_http_info(config_node_name, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: SlingApi.post_config_property ...'
+      end
+      # verify the required parameter 'config_node_name' is set
+      if @api_client.config.client_side_validation && config_node_name.nil?
+        fail ArgumentError, "Missing the required parameter 'config_node_name' when calling SlingApi.post_config_property"
+      end
+      # resource path
+      local_var_path = '/apps/system/config/{configNodeName}'.sub('{' + 'configNodeName' + '}', CGI.escape(config_node_name.to_s))
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: SlingApi#post_config_property\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
+    # @param path [String] 
+    # @param name [String] 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :operation 
     # @option opts [String] :delete_authorizable 
@@ -1687,21 +1834,19 @@ module SwaggerAemClient
     # @return [nil]
     def post_node(path, name, opts = {})
       post_node_with_http_info(path, name, opts)
-      return nil
+      nil
     end
 
-    # 
-    # 
-    # @param path 
-    # @param name 
+    # @param path [String] 
+    # @param name [String] 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :operation 
     # @option opts [String] :delete_authorizable 
     # @option opts [File] :file 
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def post_node_with_http_info(path, name, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.post_node ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.post_node ...'
       end
       # verify the required parameter 'path' is set
       if @api_client.config.client_side_validation && path.nil?
@@ -1712,61 +1857,65 @@ module SwaggerAemClient
         fail ArgumentError, "Missing the required parameter 'name' when calling SlingApi.post_node"
       end
       # resource path
-      local_var_path = "/{path}/{name}".sub('{' + 'path' + '}', path.to_s).sub('{' + 'name' + '}', name.to_s)
+      local_var_path = '/{path}/{name}'.sub('{' + 'path' + '}', CGI.escape(path.to_s)).sub('{' + 'name' + '}', CGI.escape(name.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:':operation'] = opts[:'operation'] if !opts[:'operation'].nil?
       query_params[:'deleteAuthorizable'] = opts[:'delete_authorizable'] if !opts[:'delete_authorizable'].nil?
 
       # header parameters
-      header_params = {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
+      header_params = opts[:header_params] || {}
       # HTTP header 'Content-Type'
       header_params['Content-Type'] = @api_client.select_header_content_type(['multipart/form-data'])
 
       # form parameters
-      form_params = {}
-      form_params["file"] = opts[:'file'] if !opts[:'file'].nil?
+      form_params = opts[:form_params] || {}
+      form_params['file'] = opts[:'file'] if !opts[:'file'].nil?
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#post_node\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
-    # @param path 
-    # @param name 
+    # @param path [String] 
+    # @param name [String] 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :add_members 
     # @return [nil]
     def post_node_rw(path, name, opts = {})
       post_node_rw_with_http_info(path, name, opts)
-      return nil
+      nil
     end
 
-    # 
-    # 
-    # @param path 
-    # @param name 
+    # @param path [String] 
+    # @param name [String] 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :add_members 
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def post_node_rw_with_http_info(path, name, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.post_node_rw ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.post_node_rw ...'
       end
       # verify the required parameter 'path' is set
       if @api_client.config.client_side_validation && path.nil?
@@ -1777,57 +1926,61 @@ module SwaggerAemClient
         fail ArgumentError, "Missing the required parameter 'name' when calling SlingApi.post_node_rw"
       end
       # resource path
-      local_var_path = "/{path}/{name}.rw.html".sub('{' + 'path' + '}', path.to_s).sub('{' + 'name' + '}', name.to_s)
+      local_var_path = '/{path}/{name}.rw.html'.sub('{' + 'path' + '}', CGI.escape(path.to_s)).sub('{' + 'name' + '}', CGI.escape(name.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'addMembers'] = opts[:'add_members'] if !opts[:'add_members'].nil?
 
       # header parameters
-      header_params = {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
+      header_params = opts[:header_params] || {}
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#post_node_rw\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
-    # @param path 
-    # @param jcrprimary_type 
-    # @param name 
+    # @param path [String] 
+    # @param jcrprimary_type [String] 
+    # @param name [String] 
     # @param [Hash] opts the optional parameters
     # @return [nil]
     def post_path(path, jcrprimary_type, name, opts = {})
       post_path_with_http_info(path, jcrprimary_type, name, opts)
-      return nil
+      nil
     end
 
-    # 
-    # 
-    # @param path 
-    # @param jcrprimary_type 
-    # @param name 
+    # @param path [String] 
+    # @param jcrprimary_type [String] 
+    # @param name [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def post_path_with_http_info(path, jcrprimary_type, name, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.post_path ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.post_path ...'
       end
       # verify the required parameter 'path' is set
       if @api_client.config.client_side_validation && path.nil?
@@ -1842,60 +1995,64 @@ module SwaggerAemClient
         fail ArgumentError, "Missing the required parameter 'name' when calling SlingApi.post_path"
       end
       # resource path
-      local_var_path = "/{path}/".sub('{' + 'path' + '}', path.to_s)
+      local_var_path = '/{path}/'.sub('{' + 'path' + '}', CGI.escape(path.to_s))
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'jcr:primaryType'] = jcrprimary_type
       query_params[:':name'] = name
 
       # header parameters
-      header_params = {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
+      header_params = opts[:header_params] || {}
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#post_path\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
-    # @param path 
-    # @param p_limit 
-    # @param _1_property 
-    # @param _1_property_value 
+    # @param path [String] 
+    # @param p_limit [Float] 
+    # @param _1_property [String] 
+    # @param _1_property_value [String] 
     # @param [Hash] opts the optional parameters
     # @return [String]
     def post_query(path, p_limit, _1_property, _1_property_value, opts = {})
       data, _status_code, _headers = post_query_with_http_info(path, p_limit, _1_property, _1_property_value, opts)
-      return data
+      data
     end
 
-    # 
-    # 
-    # @param path 
-    # @param p_limit 
-    # @param _1_property 
-    # @param _1_property_value 
+    # @param path [String] 
+    # @param p_limit [Float] 
+    # @param _1_property [String] 
+    # @param _1_property_value [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(String, Fixnum, Hash)>] String data, response status code and response headers
+    # @return [Array<(String, Integer, Hash)>] String data, response status code and response headers
     def post_query_with_http_info(path, p_limit, _1_property, _1_property_value, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.post_query ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.post_query ...'
       end
       # verify the required parameter 'path' is set
       if @api_client.config.client_side_validation && path.nil?
@@ -1914,61 +2071,66 @@ module SwaggerAemClient
         fail ArgumentError, "Missing the required parameter '_1_property_value' when calling SlingApi.post_query"
       end
       # resource path
-      local_var_path = "/bin/querybuilder.json"
+      local_var_path = '/bin/querybuilder.json'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'path'] = path
       query_params[:'p.limit'] = p_limit
       query_params[:'1_property'] = _1_property
       query_params[:'1_property.value'] = _1_property_value
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'String' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'String')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#post_query\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
-    # @param ignoredeactivated 
-    # @param onlymodified 
-    # @param path 
+    # @param ignoredeactivated [Boolean] 
+    # @param onlymodified [Boolean] 
+    # @param path [String] 
     # @param [Hash] opts the optional parameters
     # @return [nil]
     def post_tree_activation(ignoredeactivated, onlymodified, path, opts = {})
       post_tree_activation_with_http_info(ignoredeactivated, onlymodified, path, opts)
-      return nil
+      nil
     end
 
-    # 
-    # 
-    # @param ignoredeactivated 
-    # @param onlymodified 
-    # @param path 
+    # @param ignoredeactivated [Boolean] 
+    # @param onlymodified [Boolean] 
+    # @param path [String] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def post_tree_activation_with_http_info(ignoredeactivated, onlymodified, path, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.post_tree_activation ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.post_tree_activation ...'
       end
       # verify the required parameter 'ignoredeactivated' is set
       if @api_client.config.client_side_validation && ignoredeactivated.nil?
@@ -1983,39 +2145,45 @@ module SwaggerAemClient
         fail ArgumentError, "Missing the required parameter 'path' when calling SlingApi.post_tree_activation"
       end
       # resource path
-      local_var_path = "/etc/replication/treeactivation.html"
+      local_var_path = '/etc/replication/treeactivation.html'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'ignoredeactivated'] = ignoredeactivated
       query_params[:'onlymodified'] = onlymodified
       query_params[:'path'] = path
 
       # header parameters
-      header_params = {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
+      header_params = opts[:header_params] || {}
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#post_tree_activation\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :operation 
     # @option opts [String] :new_password 
@@ -2026,11 +2194,9 @@ module SwaggerAemClient
     # @return [String]
     def post_truststore(opts = {})
       data, _status_code, _headers = post_truststore_with_http_info(opts)
-      return data
+      data
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :operation 
     # @option opts [String] :new_password 
@@ -2038,16 +2204,16 @@ module SwaggerAemClient
     # @option opts [String] :key_store_type 
     # @option opts [String] :remove_alias 
     # @option opts [File] :certificate 
-    # @return [Array<(String, Fixnum, Hash)>] String data, response status code and response headers
+    # @return [Array<(String, Integer, Hash)>] String data, response status code and response headers
     def post_truststore_with_http_info(opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.post_truststore ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.post_truststore ...'
       end
       # resource path
-      local_var_path = "/libs/granite/security/post/truststore"
+      local_var_path = '/libs/granite/security/post/truststore'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:':operation'] = opts[:'operation'] if !opts[:'operation'].nil?
       query_params[:'newPassword'] = opts[:'new_password'] if !opts[:'new_password'].nil?
       query_params[:'rePassword'] = opts[:'re_password'] if !opts[:'re_password'].nil?
@@ -2055,78 +2221,92 @@ module SwaggerAemClient
       query_params[:'removeAlias'] = opts[:'remove_alias'] if !opts[:'remove_alias'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
       # HTTP header 'Content-Type'
       header_params['Content-Type'] = @api_client.select_header_content_type(['multipart/form-data'])
 
       # form parameters
-      form_params = {}
-      form_params["certificate"] = opts[:'certificate'] if !opts[:'certificate'].nil?
+      form_params = opts[:form_params] || {}
+      form_params['certificate'] = opts[:'certificate'] if !opts[:'certificate'].nil?
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'String' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'String')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#post_truststore\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @option opts [File] :truststore_p12 
     # @return [String]
     def post_truststore_pkcs12(opts = {})
       data, _status_code, _headers = post_truststore_pkcs12_with_http_info(opts)
-      return data
+      data
     end
 
-    # 
-    # 
     # @param [Hash] opts the optional parameters
     # @option opts [File] :truststore_p12 
-    # @return [Array<(String, Fixnum, Hash)>] String data, response status code and response headers
+    # @return [Array<(String, Integer, Hash)>] String data, response status code and response headers
     def post_truststore_pkcs12_with_http_info(opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug "Calling API: SlingApi.post_truststore_pkcs12 ..."
+        @api_client.config.logger.debug 'Calling API: SlingApi.post_truststore_pkcs12 ...'
       end
       # resource path
-      local_var_path = "/etc/truststore"
+      local_var_path = '/etc/truststore'
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['text/plain'])
       # HTTP header 'Content-Type'
       header_params['Content-Type'] = @api_client.select_header_content_type(['multipart/form-data'])
 
       # form parameters
-      form_params = {}
-      form_params["truststore.p12"] = opts[:'truststore_p12'] if !opts[:'truststore_p12'].nil?
+      form_params = opts[:form_params] || {}
+      form_params['truststore.p12'] = opts[:'truststore_p12'] if !opts[:'truststore_p12'].nil?
 
       # http body (model)
-      post_body = nil
-      auth_names = ['aemAuth']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'String' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['aemAuth']
+
+      new_options = opts.merge(
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'String')
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: SlingApi#post_truststore_pkcs12\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end