',
+ pathParams, queryParams, headerParams, formParams, postBody,
+ authNames, contentTypes, accepts, returnType
+ );
+ }
+
+
+}
+<={{ }}=>
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Apollo/api_doc.mustache b/modules/openapi-generator/src/main/resources/Javascript-Apollo/api_doc.mustache
new file mode 100644
index 00000000000..47f5a32f183
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Javascript-Apollo/api_doc.mustache
@@ -0,0 +1,112 @@
+# {{moduleName}}.{{classname}}{{#description}}
+
+{{description}}{{/description}}
+
+All URIs are relative to *{{basePath}}*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+{{#operations}}{{#operation}}[**{{operationId}}**]({{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
+{{/operation}}{{/operations}}
+
+{{#operations}}
+{{#operation}}
+
+## {{operationId}}
+
+> {{#returnType}}{{returnType}} {{/returnType}}{{operationId}}({{#requiredParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/requiredParams}}{{#optionalParams}}{{#-last}}{{#hasRequiredParams}}, {{/hasRequiredParams}}opts{{/-last}}{{/optionalParams}})
+
+{{summary}}{{#notes}}
+
+{{notes}}{{/notes}}
+
+### Example
+
+```javascript
+import {{{moduleName}}} from '{{{projectName}}}';
+{{#hasAuthMethods}}
+let defaultClient = {{{moduleName}}}.ApiClient.instance;
+{{#authMethods}}
+{{#isBasic}}
+{{#isBasicBasic}}
+// Configure HTTP basic authorization: {{{name}}}
+let {{{name}}} = defaultClient.authentications['{{{name}}}'];
+{{{name}}}.username = 'YOUR USERNAME';
+{{{name}}}.password = 'YOUR PASSWORD';
+{{/isBasicBasic}}
+{{#isBasicBearer}}
+// Configure Bearer{{#bearerFormat}} ({{{.}}}){{/bearerFormat}} access token for authorization: {{{name}}}
+let {{{name}}} = defaultClient.authentications['{{{name}}}'];
+{{{name}}}.accessToken = "YOUR ACCESS TOKEN"
+{{/isBasicBearer}}
+{{/isBasic}}
+{{#isApiKey}}
+// Configure API key authorization: {{{name}}}
+let {{{name}}} = defaultClient.authentications['{{{name}}}'];
+{{{name}}}.apiKey = 'YOUR API KEY';
+// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+//{{{name}}}.apiKeyPrefix = 'Token';
+{{/isApiKey}}
+{{#isOAuth}}
+// Configure OAuth2 access token for authorization: {{{name}}}
+let {{{name}}} = defaultClient.authentications['{{{name}}}'];
+{{{name}}}.accessToken = 'YOUR ACCESS TOKEN';
+{{/isOAuth}}
+{{/authMethods}}
+{{/hasAuthMethods}}
+
+let apiInstance = new {{{moduleName}}}.{{{classname}}}();
+{{#requiredParams}}
+let {{{paramName}}} = {{{example}}}; // {{{dataType}}} | {{{description}}}
+{{/requiredParams}}
+{{#optionalParams}}
+{{#-first}}
+let opts = {
+{{/-first}}
+ '{{{paramName}}}': {{{example}}}{{^-last}},{{/-last}} // {{{dataType}}} | {{{description}}}
+{{#-last}}
+};
+{{/-last}}
+{{/optionalParams}}
+{{#usePromises}}
+apiInstance.{{{operationId}}}({{#requiredParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/requiredParams}}{{#optionalParams}}{{#-last}}{{#hasRequiredParams}}, {{/hasRequiredParams}}opts{{/-last}}{{/optionalParams}}).then(({{#returnType}}data{{/returnType}}) => {
+ {{#returnType}}console.log('API called successfully. Returned data: ' + data);{{/returnType}}{{^returnType}}console.log('API called successfully.');{{/returnType}}
+}, (error) => {
+ console.error(error);
+});
+
+{{/usePromises}}
+{{^usePromises}}
+apiInstance.{{{operationId}}}({{#requiredParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/requiredParams}}{{#optionalParams}}{{#-last}}{{#hasRequiredParams}}, {{/hasRequiredParams}}opts{{/-last}}{{/optionalParams}}{{#hasParams}}, {{/hasParams}}(error, data, response) => {
+ if (error) {
+ console.error(error);
+ } else {
+ {{#returnType}}console.log('API called successfully. Returned data: ' + data);{{/returnType}}{{^returnType}}console.log('API called successfully.');{{/returnType}}
+ }
+});
+{{/usePromises}}
+```
+
+### Parameters
+
+{{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}
+Name | Type | Description | Notes
+------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}
+{{#allParams}} **{{paramName}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
+{{/allParams}}
+
+### Return type
+
+{{#returnType}}{{#returnTypeIsPrimitive}}**{{returnType}}**{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}[**{{returnType}}**]({{returnBaseType}}.md){{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}null (empty response body){{/returnType}}
+
+### Authorization
+
+{{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{name}}](../README.md#{{name}}){{^-last}}, {{/-last}}{{/authMethods}}
+
+### HTTP request headers
+
+- **Content-Type**: {{#consumes}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}}
+- **Accept**: {{#produces}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}}
+
+{{/operation}}
+{{/operations}}
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Apollo/api_test.mustache b/modules/openapi-generator/src/main/resources/Javascript-Apollo/api_test.mustache
new file mode 100644
index 00000000000..e56b66d47e3
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Javascript-Apollo/api_test.mustache
@@ -0,0 +1,44 @@
+{{>licenseInfo}}
+// CommonJS-like environments that support module.exports, like Node.
+factory(require('expect.js'), require(process.cwd()+'/src/{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}index'));
+
+'use strict';
+
+var instance;
+
+beforeEach(function() {
+ instance = new {{moduleName}}.{{classname}}();
+});
+
+var getProperty = function(object, getter, property) {
+ // Use getter method if present; otherwise, get the property directly.
+ if (typeof object[getter] === 'function')
+ return object[getter]();
+ else
+ return object[property];
+}
+
+var setProperty = function(object, setter, property, value) {
+ // Use setter method if present; otherwise, set the property directly.
+ if (typeof object[setter] === 'function')
+ object[setter](value);
+ else
+ object[property] = value;
+}
+
+describe('{{classname}}', function() {
+{{#operations}}
+{{#operation}}
+ describe('{{operationId}}', function() {
+ it('should call {{operationId}} successfully', function(done) {
+ //uncomment below and update the code to test {{operationId}}
+ //instance.{{operationId}}(function(error) {
+ // if (error) throw error;
+ //expect().to.be();
+ //});
+ done();
+ });
+ });
+{{/operation}}
+{{/operations}}
+});
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Apollo/enumClass.mustache b/modules/openapi-generator/src/main/resources/Javascript-Apollo/enumClass.mustache
new file mode 100644
index 00000000000..635476d2c2c
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Javascript-Apollo/enumClass.mustache
@@ -0,0 +1,15 @@
+{{#emitJSDoc}}/**
+* Allowed values for the {{baseName}} property.
+* @enum {{=<% %>=}}{<%datatype%>}<%={{ }}=%>
+* @readonly
+*/{{/emitJSDoc}}
+export default {{datatypeWithEnum}} = {
+{{#allowableValues}}{{#enumVars}}
+ {{#emitJSDoc}}/**
+ * value: {{{value}}}
+ * @const
+ */{{/emitJSDoc}}
+ "{{name}}": {{{value}}}{{^-last}},
+ {{/-last}}
+{{/enumVars}}{{/allowableValues}}
+};
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Apollo/git_push.sh.mustache b/modules/openapi-generator/src/main/resources/Javascript-Apollo/git_push.sh.mustache
new file mode 100644
index 00000000000..8b3f689c912
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Javascript-Apollo/git_push.sh.mustache
@@ -0,0 +1,58 @@
+#!/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" "gitlab.com"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+git_host=$4
+
+if [ "$git_host" = "" ]; then
+ git_host="{{{gitHost}}}"
+ echo "[INFO] No command line input provided. Set \$git_host to $git_host"
+fi
+
+if [ "$git_user_id" = "" ]; then
+ git_user_id="{{{gitUserId}}}"
+ echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+ git_repo_id="{{{gitRepoId}}}"
+ echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+ release_note="{{{releaseNote}}}"
+ echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+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.
+git commit -m "$release_note"
+
+# Sets the new remote
+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://${git_host}/${git_user_id}/${git_repo_id}.git
+ else
+ git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
+ fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Apollo/gitignore.mustache b/modules/openapi-generator/src/main/resources/Javascript-Apollo/gitignore.mustache
new file mode 100644
index 00000000000..e920c16718d
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Javascript-Apollo/gitignore.mustache
@@ -0,0 +1,33 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+node_modules
+
+# Optional npm cache directory
+.npm
+
+# Optional REPL history
+.node_repl_history
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Apollo/index.mustache b/modules/openapi-generator/src/main/resources/Javascript-Apollo/index.mustache
new file mode 100644
index 00000000000..36b8a2032d1
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Javascript-Apollo/index.mustache
@@ -0,0 +1,58 @@
+{{>licenseInfo}}
+
+import ApiClient from './ApiClient';
+{{#models}}import {{#model}}{{classFilename}}{{/model}} from './{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{importPath}}';
+{{/models}}{{#apiInfo}}{{#apis}}import {{importPath}} from './{{#apiPackage}}{{apiPackage}}/{{/apiPackage}}{{importPath}}';
+{{/apis}}{{/apiInfo}}
+
+{{#emitJSDoc}}/**{{#projectDescription}}
+* {{projectDescription}}.
{{/projectDescription}}
+* The index module provides access to constructors for all the classes which comprise the public API.
+*
+* An AMD (recommended!) or CommonJS application will generally do something equivalent to the following:
+*
+* var {{moduleName}} = require('{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}index'); // See note below*.
+* var xxxSvc = new {{moduleName}}.XxxApi(); // Allocate the API class we're going to use.
+* var yyyModel = new {{moduleName}}.Yyy(); // Construct a model instance.
+* yyyModel.someProperty = 'someValue';
+* ...
+* var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
+* ...
+*
+* *NOTE: For a top-level AMD script, use require(['{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}index'], function(){...})
+* and put the application logic within the callback function.
+*
+*
+* A non-AMD browser application (discouraged) might do something like this:
+*
+* var xxxSvc = new {{moduleName}}.XxxApi(); // Allocate the API class we're going to use.
+* var yyy = new {{moduleName}}.Yyy(); // Construct a model instance.
+* yyyModel.someProperty = 'someValue';
+* ...
+* var zzz = xxxSvc.doSomething(yyyModel); // Invoke the service.
+* ...
+*
+*
+* @module {{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}index
+* @version {{projectVersion}}
+*/{{/emitJSDoc}}
+export {
+ {{=< >=}}
+ <#emitJSDoc>/**
+ * The ApiClient constructor.
+ * @property {module:<#invokerPackage>/ApiClient}
+ */
+ ApiClient<#models>,
+
+ <#emitJSDoc>/**
+ * The model constructor.
+ * @property {module:<#invokerPackage>/<#modelPackage>/}
+ */
+ <#apiInfo><#apis>,
+
+ <#emitJSDoc>/**
+ * The service constructor.
+ * @property {module:<#invokerPackage>/<#apiPackage>/}
+ */
+
+};<={{ }}=>
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Apollo/licenseInfo.mustache b/modules/openapi-generator/src/main/resources/Javascript-Apollo/licenseInfo.mustache
new file mode 100644
index 00000000000..40cac6d4a3c
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Javascript-Apollo/licenseInfo.mustache
@@ -0,0 +1,12 @@
+/**
+ * {{{appName}}}
+ * {{{appDescription}}}
+ *
+ * {{#version}}The version of the OpenAPI document: {{{version}}}{{/version}}
+ * {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Apollo/mocha.opts b/modules/openapi-generator/src/main/resources/Javascript-Apollo/mocha.opts
new file mode 100644
index 00000000000..907011807d6
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Javascript-Apollo/mocha.opts
@@ -0,0 +1 @@
+--timeout 10000
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Apollo/model.mustache b/modules/openapi-generator/src/main/resources/Javascript-Apollo/model.mustache
new file mode 100644
index 00000000000..3ddf83730f5
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Javascript-Apollo/model.mustache
@@ -0,0 +1,4 @@
+{{>licenseInfo}}
+import ApiClient from '../ApiClient';
+{{#imports}}import {{import}} from './{{import}}';
+{{/imports}}{{#models}}{{#model}}{{#isEnum}}{{>partial_model_enum_class}}{{/isEnum}}{{^isEnum}}{{>partial_model_generic}}{{/isEnum}}{{/model}}{{/models}}
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Apollo/model_doc.mustache b/modules/openapi-generator/src/main/resources/Javascript-Apollo/model_doc.mustache
new file mode 100644
index 00000000000..04ab6f949ac
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Javascript-Apollo/model_doc.mustache
@@ -0,0 +1,26 @@
+{{#models}}{{#model}}{{#isEnum}}# {{moduleName}}.{{classname}}
+
+## Enum
+
+{{#allowableValues}}{{#enumVars}}
+* `{{name}}` (value: `{{{value}}}`)
+{{/enumVars}}{{/allowableValues}}
+{{/isEnum}}{{^isEnum}}# {{moduleName}}.{{classname}}
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#isReadOnly}}[readonly] {{/isReadOnly}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
+{{/vars}}
+{{#vars}}{{#isEnum}}
+
+
+## Enum: {{datatypeWithEnum}}
+
+{{#allowableValues}}{{#enumVars}}
+* `{{name}}` (value: `{{{value}}}`)
+{{/enumVars}}{{/allowableValues}}
+
+{{/isEnum}}{{/vars}}
+{{/isEnum}}{{/model}}{{/models}}
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Apollo/model_test.mustache b/modules/openapi-generator/src/main/resources/Javascript-Apollo/model_test.mustache
new file mode 100644
index 00000000000..9c80d3291b5
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Javascript-Apollo/model_test.mustache
@@ -0,0 +1,65 @@
+{{>licenseInfo}}
+(function(root, factory) {
+ if (typeof define === 'function' && define.amd) {
+ // AMD.
+ define(['expect.js', process.cwd()+'/src/{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}index'], factory);
+ } else if (typeof module === 'object' && module.exports) {
+ // CommonJS-like environments that support module.exports, like Node.
+ factory(require('expect.js'), require(process.cwd()+'/src/{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}index'));
+ } else {
+ // Browser globals (root is window)
+ factory(root.expect, root.{{moduleName}});
+ }
+}(this, function(expect, {{moduleName}}) {
+ 'use strict';
+
+ var instance;
+
+ beforeEach(function() {
+{{#models}}
+{{#model}}
+{{^isEnum}}
+ instance = new {{moduleName}}.{{classname}}();
+{{/isEnum}}
+{{/model}}
+{{/models}}
+ });
+
+ var getProperty = function(object, getter, property) {
+ // Use getter method if present; otherwise, get the property directly.
+ if (typeof object[getter] === 'function')
+ return object[getter]();
+ else
+ return object[property];
+ }
+
+ var setProperty = function(object, setter, property, value) {
+ // Use setter method if present; otherwise, set the property directly.
+ if (typeof object[setter] === 'function')
+ object[setter](value);
+ else
+ object[property] = value;
+ }
+
+ describe('{{classname}}', function() {
+ it('should create an instance of {{classname}}', function() {
+ // uncomment below and update the code to test {{classname}}
+ //var instane = new {{moduleName}}.{{classname}}();
+ //expect(instance).to.be.a({{moduleName}}.{{classname}});
+ });
+
+{{#models}}
+{{#model}}
+{{#vars}}
+ it('should have the property {{name}} (base name: "{{baseName}}")', function() {
+ // uncomment below and update the code to test the property {{name}}
+ //var instane = new {{moduleName}}.{{classname}}();
+ //expect(instance).to.be();
+ });
+
+{{/vars}}
+{{/model}}
+{{/models}}
+ });
+
+}));
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Apollo/package.mustache b/modules/openapi-generator/src/main/resources/Javascript-Apollo/package.mustache
new file mode 100644
index 00000000000..e6d3c752295
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Javascript-Apollo/package.mustache
@@ -0,0 +1,29 @@
+{
+ "name": "{{{projectName}}}",
+ "version": "{{{projectVersion}}}",
+ "description": "{{{projectDescription}}}",
+ "license": "{{licenseName}}",
+ "main": "src/index.js",
+ "scripts": {
+ "test": "mocha --require @babel/register --recursive"
+ },
+ "browser": {
+ "fs": false
+ },
+{{#npmRepository}}
+ "publishConfig":{
+ "registry":"{{npmRepository}}"
+ },
+{{/npmRepository}}
+ "dependencies": {
+ "apollo-datasource-rest": "^0.7.0"
+ },
+ "devDependencies": {
+ "expect.js": "^0.3.1",
+ "mocha": "^5.2.0",
+ "sinon": "^7.2.0"
+ },
+ "files": [
+ "src"
+ ]
+}
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Apollo/partial_model_enum_class.mustache b/modules/openapi-generator/src/main/resources/Javascript-Apollo/partial_model_enum_class.mustache
new file mode 100644
index 00000000000..e88ddd9cfb5
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Javascript-Apollo/partial_model_enum_class.mustache
@@ -0,0 +1,24 @@
+{{#emitJSDoc}}/**
+* Enum class {{classname}}.
+* @enum {{=<% %>=}}{<%datatype%>}<%={{ }}=%>
+* @readonly
+*/{{/emitJSDoc}}
+export default class {{classname}} {
+ {{#allowableValues}}{{#enumVars}}
+ {{#emitJSDoc}}/**
+ * value: {{{value}}}
+ * @const
+ */{{/emitJSDoc}}
+ "{{name}}" = {{{value}}};
+
+ {{/enumVars}}{{/allowableValues}}
+
+ {{#emitJSDoc}}/**
+ * Returns a {{classname}} enum value from a Javascript object name.
+ * @param {Object} data The plain JavaScript object containing the name of the enum value.
+ * @return {{=< >=}}{module:<#invokerPackage>/<#modelPackage>/}<={{ }}=> The enum {{classname}} value.
+ */{{/emitJSDoc}}
+ static constructFromObject(object) {
+ return object;
+ }
+}
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Apollo/partial_model_generic.mustache b/modules/openapi-generator/src/main/resources/Javascript-Apollo/partial_model_generic.mustache
new file mode 100644
index 00000000000..c16b43ec4d4
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Javascript-Apollo/partial_model_generic.mustache
@@ -0,0 +1,82 @@
+
+{{#models}}{{#model}}{{#emitJSDoc}}/**
+ * The {{classname}} model module.
+ * @module {{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{classname}}
+ * @version {{projectVersion}}
+ */{{/emitJSDoc}}
+class {{classname}} {{#parent}}{{^parentModel}}{{#vendorExtensions.x-is-array}}extends Array {{/vendorExtensions.x-is-array}}{{/parentModel}}{{/parent}}{
+ {{#vars}}
+ {{#emitJSDoc}}/**
+ * @member {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=> {{baseName}}
+ * @type {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=>{{#defaultValue}}
+ * @default {{{defaultValue}}}{{/defaultValue}}
+ */{{/emitJSDoc}}
+ {{baseName}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}};
+ {{/vars}}
+
+ {{#useInheritance}}{{#interfaceModels}}{{#allVars}}{{#emitJSDoc}}/**
+ * @member {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=> {{baseName}}
+ * @type {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=>
+ */{{/emitJSDoc}}
+ #{{baseName}};
+ {{/allVars}}{{/interfaceModels}}{{/useInheritance}}
+
+ {{#emitJSDoc}}/**
+ * Constructs a new {{classname}}.{{#description}}
+ * {{description}}{{/description}}
+ * @alias module:{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{classname}}{{#useInheritance}}{{#parent}}
+ * @extends {{#parentModel}}module:{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{classname}}{{/parentModel}}{{^parentModel}}{{#vendorExtensions.x-is-array}}Array{{/vendorExtensions.x-is-array}}{{#vendorExtensions.x-is-map}}Object{{/vendorExtensions.x-is-map}}{{/parentModel}}{{/parent}}{{#interfaces}}
+ * @implements module:{{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}{{#modelPackage}}{{modelPackage}}/{{/modelPackage}}{{.}}{{/interfaces}}{{/useInheritance}}{{#vendorExtensions.x-all-required}}
+ * @param {{name}} {{=< >=}}{<&vendorExtensions.x-jsdoc-type>}<={{ }}=> {{#description}}{{{description}}}{{/description}}{{/vendorExtensions.x-all-required}}
+ */{{/emitJSDoc}}
+ constructor({{#vendorExtensions.x-all-required}}{{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-all-required}}) { {{#parent}}{{^parentModel}}{{#vendorExtensions.x-is-array}}
+ super();
+ {{/vendorExtensions.x-is-array}}{{/parentModel}}{{/parent}}{{#useInheritance}}
+ {{#interfaceModels}}{{classname}}.initialize(this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});{{/interfaceModels}}{{/useInheritance}}
+ {{classname}}.initialize(this{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}});
+ }
+
+ {{#emitJSDoc}}/**
+ * Initializes the fields of this object.
+ * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
+ * Only for internal use.
+ */{{/emitJSDoc}}
+ static initialize(obj{{#vendorExtensions.x-all-required}}, {{name}}{{/vendorExtensions.x-all-required}}) { {{#vars}}{{#required}}
+ obj['{{baseName}}'] = {{name}};{{/required}}{{/vars}}
+ }
+
+ {{#emitJSDoc}}/**
+ * Constructs a {{classname}} from a plain JavaScript object, optionally creating a new instance.
+ * Copies all relevant properties from data to obj if supplied or a new instance if not.
+ * @param {Object} data The plain JavaScript object bearing properties of interest.
+ * @param {{=< >=}}{module:<#invokerPackage>/<#modelPackage>/}<={{ }}=> obj Optional instance to populate.
+ * @return {{=< >=}}{module:<#invokerPackage>/<#modelPackage>/}<={{ }}=> The populated {{classname}} instance.
+ */{{/emitJSDoc}}
+ static constructFromObject(data, obj) {
+ if (data){{! TODO: support polymorphism: discriminator property on data determines class to instantiate.}} {
+ obj = obj || new {{classname}}();{{#parent}}{{^parentModel}}
+
+ ApiClient.constructFromObject(data, obj, '{{vendorExtensions.x-item-type}}');
+ {{/parentModel}}{{/parent}}{{#useInheritance}}{{#parentModel}}
+ {{classname}}.constructFromObject(data, obj);{{/parentModel}}{{#interfaces}}
+ {{.}}.constructFromObject(data, obj);{{/interfaces}}{{/useInheritance}}
+
+ {{#vars}}
+ if (data.hasOwnProperty('{{baseName}}')) {
+ obj['{{baseName}}']{{{defaultValueWithParam}}}
+ }
+ {{/vars}}
+ }
+ return obj;
+ }
+ {{/model}}
+}
+
+{{#vars}}{{#isEnum}}{{^isContainer}}
+{{>partial_model_inner_enum}}
+{{/isContainer}}{{/isEnum}}{{#items.isEnum}}{{#items}}{{^isContainer}}
+{{>partial_model_inner_enum}}
+{{/isContainer}}{{/items}}{{/items.isEnum}}{{/vars}}
+
+export default {{classname}};
+{{/models}}
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Apollo/partial_model_inner_enum.mustache b/modules/openapi-generator/src/main/resources/Javascript-Apollo/partial_model_inner_enum.mustache
new file mode 100644
index 00000000000..17cea4407d5
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Javascript-Apollo/partial_model_inner_enum.mustache
@@ -0,0 +1,15 @@
+{{#emitJSDoc}}/**
+ * Allowed values for the {{baseName}} property.
+ * @enum {{=<% %>=}}{<%datatype%>}<%={{ }}=%>
+ * @readonly
+ */{{/emitJSDoc}}
+{{classname}}['{{datatypeWithEnum}}'] = {
+{{#allowableValues}}{{#enumVars}}
+ {{#emitJSDoc}}/**
+ * value: {{{value}}}
+ * @const
+ */{{/emitJSDoc}}
+ "{{name}}": {{{value}}}{{^-last}},
+ {{/-last}}
+{{/enumVars}}{{/allowableValues}}
+};
diff --git a/modules/openapi-generator/src/main/resources/Javascript-Apollo/travis.yml b/modules/openapi-generator/src/main/resources/Javascript-Apollo/travis.yml
new file mode 100644
index 00000000000..0968f7a4333
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Javascript-Apollo/travis.yml
@@ -0,0 +1,5 @@
+language: node_js
+cache: npm
+node_js:
+ - "6"
+ - "6.1"
diff --git a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
index 58a7428cf92..cac33205e17 100644
--- a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
+++ b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
@@ -60,6 +60,7 @@ org.openapitools.codegen.languages.JavaResteasyServerCodegen
org.openapitools.codegen.languages.JavaResteasyEapServerCodegen
org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen
org.openapitools.codegen.languages.JavascriptClientCodegen
+org.openapitools.codegen.languages.JavascriptApolloClientCodegen
org.openapitools.codegen.languages.JavascriptFlowtypedClientCodegen
org.openapitools.codegen.languages.JavascriptClosureAngularClientCodegen
org.openapitools.codegen.languages.JMeterClientCodegen
diff --git a/pom.xml b/pom.xml
index 500d195b14e..4c8f3fcb339 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1239,6 +1239,7 @@
samples/server/petstore/php-slim
samples/server/petstore/php-slim4
samples/client/petstore/javascript
+ samples/client/petstore/javascript-apollo
samples/client/petstore/javascript-es6
samples/openapi3/client/petstore/javascript-es6
samples/client/petstore/javascript-promise
diff --git a/website/i18n/en.json b/website/i18n/en.json
index 890f1a9d449..89b5ad427b6 100644
--- a/website/i18n/en.json
+++ b/website/i18n/en.json
@@ -271,6 +271,10 @@
"title": "Config Options for javascript",
"sidebar_label": "javascript"
},
+ "generators/javascript-apollo": {
+ "title": "Config Options for javascript-apollo",
+ "sidebar_label": "javascript-apollo"
+ },
"generators/jaxrs-cxf-cdi": {
"title": "Config Options for jaxrs-cxf-cdi",
"sidebar_label": "jaxrs-cxf-cdi"