loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

replacing caTools dependency with base64enc (#6349)

Browse Source 
* replacing caTools dependency with base64enc

* adding review fixes

* fix(r) : updated the cran repo url
This commit is contained in:
Ramanth Addala 2020-05-20 18:49:13 +05:30 committed by GitHub
parent 5f2979c434
commit a0bfc3c1f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/r/README.mustache vendored
View File

@ -26,7 +26,7 @@ Install the dependencies
```R ```R
install.packages("jsonlite") install.packages("jsonlite")
install.packages("httr") install.packages("httr")
install.packages("caTools") install.packages("base64enc")
``` ```
### Build the package ### Build the package

4
modules/openapi-generator/src/main/resources/r/api.mustache vendored
View File

@ -141,7 +141,7 @@
{{/operation}} {{/operation}}
#' } #' }
#' @importFrom R6 R6Class #' @importFrom R6 R6Class
#' @importFrom caTools base64encode #' @importFrom base64enc base64encode
{{#useRlangExceptionHandling}} {{#useRlangExceptionHandling}}
#' @importFrom rlang abort #' @importFrom rlang abort
{{/useRlangExceptionHandling}} {{/useRlangExceptionHandling}}
@ -239,7 +239,7 @@
{{#isBasic}} {{#isBasic}}
{{#isBasicBasic}} {{#isBasicBasic}}
# HTTP basic auth # HTTP basic auth
headerParams['Authorization'] <- paste("Basic", caTools::base64encode(paste(self$apiClient$username, self$apiClient$password, sep=":")), sep=" ") headerParams['Authorization'] <- paste("Basic", base64enc::base64encode(charToRaw(paste(self$apiClient$username, self$apiClient$password, sep=":"))))
{{/isBasicBasic}} {{/isBasicBasic}}
{{/isBasic}} {{/isBasic}}
{{#isApiKey}} {{#isApiKey}}

2
modules/openapi-generator/src/main/resources/r/description.mustache vendored
View File

@ -10,5 +10,5 @@ Encoding: UTF-8
License: {{#licenseInfo}}{{licenseInfo}}{{/licenseInfo}}{{^licenseInfo}}Unlicense{{/licenseInfo}} License: {{#licenseInfo}}{{licenseInfo}}{{/licenseInfo}}{{^licenseInfo}}Unlicense{{/licenseInfo}}
LazyData: true LazyData: true
Suggests: testthat Suggests: testthat
Imports: jsonlite, httr, R6, caTools{{#useRlangExceptionHandling}}, rlang{{/useRlangExceptionHandling}} Imports: jsonlite, httr, R6, base64enc{{#useRlangExceptionHandling}}, rlang{{/useRlangExceptionHandling}}
RoxygenNote: 6.0.1.9000 RoxygenNote: 6.0.1.9000

2
samples/client/petstore/R/DESCRIPTION
View File

@ -10,5 +10,5 @@ Encoding: UTF-8
License: Apache-2.0 License: Apache-2.0
LazyData: true LazyData: true
Suggests: testthat Suggests: testthat
Imports: jsonlite, httr, R6, caTools Imports: jsonlite, httr, R6, base64enc
RoxygenNote: 6.0.1.9000 RoxygenNote: 6.0.1.9000

2
samples/client/petstore/R/R/pet_api.R
View File

@ -317,7 +317,7 @@
#' #'
#' } #' }
#' @importFrom R6 R6Class #' @importFrom R6 R6Class
#' @importFrom caTools base64encode #' @importFrom base64enc base64encode
#' @export #' @export
PetApi <- R6::R6Class( PetApi <- R6::R6Class(
'PetApi', 'PetApi',

2
samples/client/petstore/R/R/store_api.R
View File

@ -160,7 +160,7 @@
#' #'
#' } #' }
#' @importFrom R6 R6Class #' @importFrom R6 R6Class
#' @importFrom caTools base64encode #' @importFrom base64enc base64encode
#' @export #' @export
StoreApi <- R6::R6Class( StoreApi <- R6::R6Class(
'StoreApi', 'StoreApi',

2
samples/client/petstore/R/R/user_api.R
View File

@ -277,7 +277,7 @@
#' #'
#' } #' }
#' @importFrom R6 R6Class #' @importFrom R6 R6Class
#' @importFrom caTools base64encode #' @importFrom base64enc base64encode
#' @export #' @export
UserApi <- R6::R6Class( UserApi <- R6::R6Class(
'UserApi', 'UserApi',

2
samples/client/petstore/R/README.md
View File

@ -18,7 +18,7 @@ Install the dependencies
```R ```R
install.packages("jsonlite") install.packages("jsonlite")
install.packages("httr") install.packages("httr")
install.packages("caTools") install.packages("base64enc")
``` ```
### Build the package ### Build the package

4
samples/client/petstore/R/test_petstore.bash
View File

@ -2,7 +2,7 @@
set -e set -e
REPO=http://cran.revolutionanalytics.com REPO=https://cloud.r-project.org
export R_LIBS_USER=$HOME/R export R_LIBS_USER=$HOME/R
@ -14,7 +14,7 @@ Rscript -e "install.packages('jsonlite', repos='$REPO', lib='$R_LIBS_USER')"
Rscript -e "install.packages('httr', repos='$REPO', lib='$R_LIBS_USER')" Rscript -e "install.packages('httr', repos='$REPO', lib='$R_LIBS_USER')"
Rscript -e "install.packages('testthat', repos='$REPO', lib='$R_LIBS_USER')" Rscript -e "install.packages('testthat', repos='$REPO', lib='$R_LIBS_USER')"
Rscript -e "install.packages('R6', repos='$REPO', lib='$R_LIBS_USER')" Rscript -e "install.packages('R6', repos='$REPO', lib='$R_LIBS_USER')"
Rscript -e "install.packages('caTools', repos='$REPO', lib='$R_LIBS_USER')" Rscript -e "install.packages('base64enc', repos='$REPO', lib='$R_LIBS_USER')"
Rscript -e "install.packages('rlang', repos='$REPO', lib='$R_LIBS_USER')" Rscript -e "install.packages('rlang', repos='$REPO', lib='$R_LIBS_USER')"
R CMD build . R CMD build .