fix: add quotes to accept spaces in the JAVA_HOME path

Author: mok-liee

apps/generator-cli/src/app/helpers/index.ts

@@ -0,0 +1,7 @@
+/**
+ * If JAVA_HOME is set, it returns `$JAVA_HOME/bin/java`
+ * otherwise it returns `java` and it has to be in the `PATH`
+ */
+export const javaCmd: string = process.env['JAVA_HOME']
+  ? `"${process.env['JAVA_HOME']}/bin/java"`
+  : 'java';

apps/generator-cli/src/app/services/generator.service.spec.ts

@@ -1,6 +1,7 @@
 import { Test } from '@nestjs/testing';
 import { GeneratorService } from './generator.service';
 import { LOGGER } from '../constants';
+import { javaCmd } from '../helpers';
 import { VersionManagerService } from './version-manager.service';
 import { ConfigService } from './config.service';
 
@@ -145,9 +146,6 @@ describe('GeneratorService', () => {
         )}`,
       });
 
-      const javaHome = process.env['JAVA_HOME'];
-      const javaCmd = javaHome ? `${javaHome}/bin/java` : 'java';
-
       describe.each([
         [
           'foo.json',

apps/generator-cli/src/app/services/generator.service.ts

@@ -10,6 +10,7 @@ import * as os from 'os';
 import { VersionManagerService } from './version-manager.service';
 import { ConfigService } from './config.service';
 import { LOGGER } from '../constants';
+import { javaCmd } from '../helpers';
 
 interface GeneratorConfig {
   glob: string;
@@ -242,17 +243,10 @@ export class GeneratorService {
         )}" org.openapitools.codegen.OpenAPIGenerator`
       : `-jar "${cliPath}"`;
 
-    const javaHome = process.env['JAVA_HOME'];
-    const javaCmd = javaHome ? `${javaHome}/bin/java` : 'java';
-    
-    return [
-      javaCmd,
-      process.env['JAVA_OPTS'],
-      subCmd,
-      'generate',
-      appendix,
-    ].filter(isString).join(' ');
-  }
+    return [javaCmd, process.env['JAVA_OPTS'], subCmd, 'generate', appendix]
+      .filter(isString)
+      .join(' ');
+  };
 
   private isWin = () => process.platform === 'win32';
 }

apps/generator-cli/src/app/services/pass-through.service.spec.ts

@@ -2,6 +2,7 @@ import { Test } from '@nestjs/testing';
 import chalk from 'chalk';
 import { Command, createCommand } from 'commander';
 import { COMMANDER_PROGRAM, LOGGER } from '../constants';
+import { javaCmd } from '../helpers';
 import { GeneratorService } from './generator.service';
 import { PassThroughService } from './pass-through.service';
 import { VersionManagerService } from './version-manager.service';
@@ -192,7 +193,7 @@ describe('PassThroughService', () => {
             await program.parseAsync([name, ...argv], { from: 'user' });
             expect(childProcess.spawn).toHaveBeenNthCalledWith(
               1,
-              'java -jar "/some/path/to/4.2.1.jar"',
+              `${javaCmd} -jar "/some/path/to/4.2.1.jar"`,
               [name, ...argv],
               {
                 stdio: 'inherit',
@@ -206,7 +207,7 @@ describe('PassThroughService', () => {
             await program.parseAsync([name, ...argv], { from: 'user' });
             expect(childProcess.spawn).toHaveBeenNthCalledWith(
               1,
-              'java java-opt-1=1 -jar "/some/path/to/4.2.1.jar"',
+              `${javaCmd} java-opt-1=1 -jar "/some/path/to/4.2.1.jar"`,
               [name, ...argv],
               {
                 stdio: 'inherit',
@@ -224,7 +225,7 @@ describe('PassThroughService', () => {
 
             expect(childProcess.spawn).toHaveBeenNthCalledWith(
               1,
-              `java -cp "${[
+              `${javaCmd} -cp "${[
                 '/some/path/to/4.2.1.jar',
                 '../some/custom.jar',
               ].join(cpDelimiter)}" org.openapitools.codegen.OpenAPIGenerator`,
@@ -303,7 +304,7 @@ describe('PassThroughService', () => {
                   it('spawns the correct process', () => {
                     expect(childProcess.spawn).toHaveBeenNthCalledWith(
                       1,
-                      'java -jar "/some/path/to/4.2.1.jar"',
+                      `${javaCmd} -jar "/some/path/to/4.2.1.jar"`,
                       cmd.split(' '),
                       { stdio: 'inherit', shell: true }
                     );

apps/generator-cli/src/app/services/pass-through.service.ts

@@ -4,6 +4,7 @@ import { exec, spawn } from 'child_process';
 import { Command } from 'commander';
 import { isString, startsWith, trim } from 'lodash';
 import { COMMANDER_PROGRAM, LOGGER } from '../constants';
+import { javaCmd } from '../helpers';
 import { GeneratorService } from './generator.service';
 import { VersionManagerService } from './version-manager.service';
 import { ConfigService } from './config.service';
@@ -142,7 +143,7 @@ export class PassThroughService {
         )}" org.openapitools.codegen.OpenAPIGenerator`
       : `-jar "${cliPath}"`;
 
-    return ['java', process.env['JAVA_OPTS'], subCmd]
+    return [javaCmd, process.env['JAVA_OPTS'], subCmd]
       .filter(isString)
       .join(' ');
   }