forked from loafle/openapi-generator-original
Merge remote-tracking branch 'origin/4.2.x' into 5.0.x
This commit is contained in:
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
|
||||
------------ | ------------- | ------------- | -------------
|
||||
**stringItem** | **String** | |
|
||||
**numberItem** | **Number** | |
|
||||
**floatItem** | **Number** | |
|
||||
**integerItem** | **Number** | |
|
||||
**boolItem** | **Boolean** | |
|
||||
**arrayItem** | **[Number]** | |
|
||||
|
||||
@@ -1,11 +1,17 @@
|
||||
#!/bin/sh
|
||||
# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
|
||||
#
|
||||
# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
|
||||
# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
|
||||
|
||||
git_user_id=$1
|
||||
git_repo_id=$2
|
||||
release_note=$3
|
||||
git_host=$4
|
||||
|
||||
if [ "$git_host" = "" ]; then
|
||||
git_host="github.com"
|
||||
echo "[INFO] No command line input provided. Set \$git_host to $git_host"
|
||||
fi
|
||||
|
||||
if [ "$git_user_id" = "" ]; then
|
||||
git_user_id="GIT_USER_ID"
|
||||
@@ -28,7 +34,7 @@ git init
|
||||
# Adds the files in the local repository and stages them for commit.
|
||||
git add .
|
||||
|
||||
# Commits the tracked changes and prepares them to be pushed to a remote repository.
|
||||
# Commits the tracked changes and prepares them to be pushed to a remote repository.
|
||||
git commit -m "$release_note"
|
||||
|
||||
# Sets the new remote
|
||||
@@ -36,10 +42,10 @@ git_remote=`git remote`
|
||||
if [ "$git_remote" = "" ]; then # git remote not defined
|
||||
|
||||
if [ "$GIT_TOKEN" = "" ]; then
|
||||
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the Git credential in your environment."
|
||||
git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
|
||||
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
|
||||
git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
|
||||
else
|
||||
git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
|
||||
git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
|
||||
fi
|
||||
|
||||
fi
|
||||
@@ -47,6 +53,6 @@ fi
|
||||
git pull origin master
|
||||
|
||||
# Pushes (Forces) the changes in the local repository up to the remote repository
|
||||
echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
|
||||
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
|
||||
git push origin master 2>&1 | grep -v 'To https'
|
||||
|
||||
|
||||
@@ -24,13 +24,14 @@ class TypeHolderExample {
|
||||
* @alias module:model/TypeHolderExample
|
||||
* @param stringItem {String}
|
||||
* @param numberItem {Number}
|
||||
* @param floatItem {Number}
|
||||
* @param integerItem {Number}
|
||||
* @param boolItem {Boolean}
|
||||
* @param arrayItem {Array.<Number>}
|
||||
*/
|
||||
constructor(stringItem, numberItem, integerItem, boolItem, arrayItem) {
|
||||
constructor(stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem) {
|
||||
|
||||
TypeHolderExample.initialize(this, stringItem, numberItem, integerItem, boolItem, arrayItem);
|
||||
TypeHolderExample.initialize(this, stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -38,9 +39,10 @@ class TypeHolderExample {
|
||||
* This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
|
||||
* Only for internal use.
|
||||
*/
|
||||
static initialize(obj, stringItem, numberItem, integerItem, boolItem, arrayItem) {
|
||||
static initialize(obj, stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem) {
|
||||
obj['string_item'] = stringItem;
|
||||
obj['number_item'] = numberItem;
|
||||
obj['float_item'] = floatItem;
|
||||
obj['integer_item'] = integerItem;
|
||||
obj['bool_item'] = boolItem;
|
||||
obj['array_item'] = arrayItem;
|
||||
@@ -63,6 +65,9 @@ class TypeHolderExample {
|
||||
if (data.hasOwnProperty('number_item')) {
|
||||
obj['number_item'] = ApiClient.convertToType(data['number_item'], 'Number');
|
||||
}
|
||||
if (data.hasOwnProperty('float_item')) {
|
||||
obj['float_item'] = ApiClient.convertToType(data['float_item'], 'Number');
|
||||
}
|
||||
if (data.hasOwnProperty('integer_item')) {
|
||||
obj['integer_item'] = ApiClient.convertToType(data['integer_item'], 'Number');
|
||||
}
|
||||
@@ -89,6 +94,11 @@ TypeHolderExample.prototype['string_item'] = undefined;
|
||||
*/
|
||||
TypeHolderExample.prototype['number_item'] = undefined;
|
||||
|
||||
/**
|
||||
* @member {Number} float_item
|
||||
*/
|
||||
TypeHolderExample.prototype['float_item'] = undefined;
|
||||
|
||||
/**
|
||||
* @member {Number} integer_item
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user