Merge e48ddb9 into 9bf634c

.travis.yml

@@ -2,7 +2,7 @@ language: java
 jdk:
   - openjdk10
 before_install:
-  - nvm install 8.9.4
+  - nvm install 10.16.2
   - cd ./generator-java
   - npm i -g makeshift && makeshift -r https://registry.npmjs.org
   - npm i -g standard-version
@@ -11,9 +11,9 @@ install:
   - npm run install_linked_dependencies
 before_script:
   - cd /tmp
-  - wget http://services.gradle.org/distributions/gradle-5.0-bin.zip
-  - unzip -qq gradle-5.0-bin.zip
-  - export GRADLE_HOME=/tmp/gradle-5.0
+  - wget http://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+  - unzip -qq gradle-5.5.1-bin.zip
+  - export GRADLE_HOME=/tmp/gradle-5.5.1
   - wget https://github.com/github/hub/releases/download/v2.5.1/hub-linux-386-2.5.1.tgz
   - tar -xvzf hub-linux-386-2.5.1.tgz
   - mv hub-linux-386-2.5.1 hub

generator-java/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [5.15.0](https://github.com/ibm-developer/generator-ibm-java/compare/v5.14.3...v5.15.0) (2019-08-12)
+
+
+### Features
+
+* **sdkgen:** remove api discovery ([ebf649a](https://github.com/ibm-developer/generator-ibm-java/commit/ebf649a))
+* **sdkgen:** remove sdkgen ([c272fdc](https://github.com/ibm-developer/generator-ibm-java/commit/c272fdc))
+
 ### [5.14.3](https://github.com/ibm-developer/generator-ibm-java/compare/v5.14.2...v5.14.3) (2019-08-08)
 
 

generator-java/generators/app/index.js

@@ -20,7 +20,6 @@ const Generator = require('yeoman-generator')
 const fspath = require('path')
 const fs = require('fs')
 const extend = require('extend')
-const yml = require('js-yaml')
 
 const Defaults = require('../lib/defaults')
 const EnablementContext = require('../lib/enablementContext')
@@ -155,28 +154,7 @@ module.exports = class extends Generator {
       'generator-ibm-cloud-enablement': pkg.dependencies['generator-ibm-cloud-enablement']
     }
     config.genVersions['generator-ibm-java-' + config.frameworkType] = pkg.dependencies['generator-ibm-java-' + config.frameworkType]
-    if (config.frameworkType === 'liberty' && config.createType === 'bff/liberty') {
-      config.enableApiDiscovery = true
-    }
-    if (config.frameworkType === 'spring' && config.createType === 'bff/spring') {
-      const resource = this._loadresource('bff/swagger.yaml');
-      const bffSwagger = JSON.stringify(yml.safeLoad(resource));
-      if (config.bluemix) {
-        if (config.bluemix.openApiServers) {
-          config.bluemix.openApiServers.push({'spec': bffSwagger})
-        } else {
-          config.bluemix.openApiServers = [{'spec': bffSwagger}]
-        }
-      } else {
-        config.bluemix = {
-          openApiServers: [
-            {
-              'spec': bffSwagger
-            }
-          ]
-        }
-      }
-    }
+
     //configure this generator and then pass that down through the contexts
     const control = new Control(fspath.resolve(config.templateRoot, config.createType), config)
     this.paths = control.getComposition()
@@ -193,7 +171,6 @@ module.exports = class extends Generator {
         context.conf.addJndiEntries(config.jndiEntries)
       }
       context.addCompositions(control.getSubComposition(context.id))
-      context.conf.enableApiDiscovery = config.enableApiDiscovery
     })
     enablementContexts.forEach(context => {
       context.appName = config.appName

generator-java/generators/app/templates/bff/spring/src/main/java/io/swagger/Info.java

@@ -10,8 +10,6 @@ public class Info {
 	@EventListener(ApplicationReadyEvent.class)
 	  public void contextRefreshedEvent() {
 	    System.out.println("The following endpoints are available by default :-");
-	    System.out.println("  OpenAPI UI    : http://localhost:8080/swagger-ui.html");
-	    System.out.println("  OpenAPI json  : http://localhost:8080/swagger/api");
 	  }
 
 }

generator-java/generators/app/templates/blank/spring/control.js

@@ -1,8 +1,5 @@
 {
   "excludes" : [
-{{#if bluemix.openApiServers}}
-    "src/main/java/application/SBApplication.java",
-{{/if}}
     ".classpath",
     ".project"
   ],

generator-java/generators/liberty/exports.js

@@ -20,7 +20,6 @@ module.exports = {
   integrationAsserts : {
     technologies : require('./lib/assert.technologies'),
     liberty : require('./lib/assert.liberty'),
-    openapi : require('./lib/assert.openapi')
   },
   defaults: require('./lib/defaults'),
   prompts: [require('./prompts/liberty')]

generator-java/generators/liberty/index.js

@@ -20,7 +20,6 @@ const constant = require('./lib/constant')
 const Generator = require('yeoman-generator');
 const extend = require('extend');
 const Defaults = require('./lib/defaults');
-const OpenApi = require('./lib/openapi');
 
 const defaults = new Defaults();
 const logId = require('../../package.json').name;
@@ -34,8 +33,6 @@ module.exports = class extends Generator {
     this.logger.writeToLog(`${logId}:constructor - context`, JSON.stringify(opts.context));
     this.patterns.push('picnmix');
     this.conf.addMissing(opts, defaults);
-    this.openApiDir = [];
-    this.conf.enableApiDiscovery = this.config.enableApiDiscovery || false;
 
     if (this.options.libertyVersion === 'beta' || opts.context.conf.libertyVersion === 'beta') {
       this.conf.libertyBeta = true
@@ -55,17 +52,6 @@ module.exports = class extends Generator {
 
   configuring() {
     this.configure(this);
-    if (this.conf.technologies.includes('swagger')) {
-      this.conf.enableApiDiscovery = true;
-    }
-    this.openApiDir = [];
-    if (this.conf.bluemix && this.conf.bluemix.openApiServers && this.conf.bluemix.backendPlatform == 'JAVA') {
-      this.conf.enableApiDiscovery = true;
-      return OpenApi.generate(this.conf.bluemix.openApiServers)
-        .then(dir => {
-          this.openApiDir = dir;
-        });
-    }
   }
 
   writing() {
@@ -75,9 +61,6 @@ module.exports = class extends Generator {
     if (this.conf.buildType == 'gradle') {
       this.conf.bxBuildCmd = '`gradle build cfPush -PcfOrg=[your email address] -PcfUsername=[your username] -PcfPassword=[your password]`';
     }
-    if (this.openApiDir.length > 0) {
-      OpenApi.writeFiles(this.openApiDir, this);
-    }
     return this.defaultWriter(this); //use the default writer supplied by the context.
   }