@sap/cds-dk 7.8.2 → 7.9.1

package/lib/init/template/helm/files/content-deployment/values.schema.json

@@ -1,6 +1,5 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema",
-    "$id": "https://github.tools.sap/cki/content-deployment/blob/main/values.schema.json",
     "type": "object",
     "required": [
         "image", "bindings"

package/lib/init/template/helm/files/service-instance/Chart.yaml

@@ -1,7 +1,5 @@
 apiVersion: v2
 description: A Helm chart for creating service instances on btp-service-operator
 name: service-instance
-sources:
-- https://github.tools.sap/unified-runtime/service-instance
 type: application
 version: 1.3.0

package/lib/init/template/helm/files/service-instance/values.schema.json

@@ -1,6 +1,5 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema",
-    "$id": "https://github.tools.sap/cki/web-application-cf/blob/main/values.schema.json",
     "type": "object",
     "required": [
         "serviceOfferingName",

package/lib/init/template/helm/files/web-application/Chart.yaml

@@ -2,7 +2,5 @@ apiVersion: v2
 description: A Helm chart for web app
 kubeVersion: '>= 1.21'
 name: web-application
-sources:
-- https://github.tools.sap/unified-runtime/web-application
 type: application
 version: 1.13.1

package/lib/init/template/helm/files/web-application/values.schema.json

@@ -1,6 +1,5 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema",
-    "$id": "https://github.tools.sap/cki/web-application/blob/main/values.schema.json",
     "type": "object",
     "required": [
         "image",

package/lib/init/template/helm-unified-runtime/files/values.schema.json

@@ -187,7 +187,7 @@
                             ],
                             "properties": {
                                 "fromSecret": {
-                                    "description": "Name of a Kubernetes Secret, with the binding content, compliant to the SAP Kubernetes Service Binding spec https://github.tools.sap/Kubernetes-Service-Bindings/doc/",
+                                    "description": "Name of a Kubernetes Secret, with the binding content, compliant to the SAP Kubernetes Service Binding spec",
                                     "$ref": "#/definitions/KubernetesName"
                                 }
                             }

package/lib/init/template/http/index.js

@@ -1,21 +1,26 @@
+const https = require('node:https')
+const axios = require('axios')
+const asJson = require("../data/as-json")
 const cds = require('../../../cds')
 const cf = require("../../../util/cf")
 const { write, exists } = cds.utils
+const { filterStringAsRegex } = require("../data/index")
 
 module.exports = class HttpTemplate extends require('../../plugin') {
 
-  #defaultHost = "http://localhost:4004"
-  #defaultPathPrefix = "/odata/v4/"
-  #defaultDirName = "*"
+  #nodeHost = "http://localhost:4004"
+  #javaHost = "http://localhost:8080"
   #defaultOutputDir = "http"
-  #defaultAuth = `Authorization: Basic yves:`
+  #defaultAuth = `Authorization: Basic alice:`
 
   options() {
     return {
       'filter': {
         type: 'string',
         short: 'f',
-        help: `Specify the path to the service definition file or directory. Default is ${this.#defaultDirName}.`
+        help: `Filter for services or entities or actions matching the given pattern. If it contains meta
+        characters like '^' or '*', it is treated as a regular expression,
+        otherwise as an include pattern, i.e /.*pattern.*/i`
       },
       'for-app': {
         type: 'string',
@@ -26,146 +31,187 @@ module.exports = class HttpTemplate extends require('../../plugin') {
         type: 'string',
         short: 'o',
         help: 'The output directory. By default, an `http` dir will be created in one of the following: test/tests/__tests__, whichever already exists. If none exists, an `http` dir will be created at the root level.'
+      },
+      'dry': {
+        type: 'boolean',
+        help: 'Print the generated requests to the console instead of writing them to a file.'
       }
     }
   }
 
   async run() {
-
-    const path = cds.cli.options['filter'] || this.#defaultDirName
-    const csn = await cds.load(path)
+    const csn = await cds.load(cds.env.roots).then(cds.minify)
     cds.linked(csn)
 
-    let [hostname, auth] = await this.#getHostnameAndAuth()
-
-    let endpoints = this.#collectEndpointInfo(csn)
+    const serviceInfo = cds.compile.to.serviceinfo(csn)
+    let [hostname, auth] = await this.#getHostnameAndAuth(serviceInfo)
+    let services = this.#collectServiceInfo(csn, serviceInfo)
+    if (!services)  return
 
-    this.#generateRequests(endpoints, hostname, auth)
+    const payload = await this.#generatePayload(csn, services)
+    this.#generateRequests(services, hostname, auth, payload)
   }
 
-  async #getHostnameAndAuth() {
+  async #getHostnameAndAuth(serviceInfo) {
     if (!cds.cli.options['for-app']) {
-      return [this.#defaultHost, this.#defaultAuth]
+      if (serviceInfo[0].runtime === 'Java') {
+        return [this.#javaHost, null]
+      } else {
+        return [this.#nodeHost, this.#defaultAuth]
+      }
     }
 
-    const env = await cf.getEnv(cds.cli.options['for-app'])
+    const app = cds.cli.options['for-app']
+    // Later: differentiate between CF and Kyma
+    const env = await cf.getEnv(app)
+    if (!cds.cli.options.dry)   console.error('Fetching credentials from Cloud Foundry app \'' + app + '\'...')
     const hostname = `https://${env.application_env_json.VCAP_APPLICATION.application_uris[0]}`
-    const { url, clientid, clientsecret } = env.system_env_json.VCAP_SERVICES?.xsuaa[0]?.credentials || {}
-
-    const response = await fetch(`${url}/oauth/token?${new URLSearchParams({
-      grant_type: 'client_credentials',
-      response_type: 'token',
-    })}`, {
-      method: 'GET',
-      headers: {
-        'Authorization': `Basic ${Buffer.from(`${clientid}:${clientsecret}`).toString('base64')}`
-      }
-    })
-    if (response.ok) {
-      const { access_token } = await response.json()
-      const auth = `x-approuter-authorization: bearer ` + access_token
-      return [hostname, auth]
-    } else {
-      throw new Error('Error authenticating ', { url, response })
-    }
+    const xsuaaCredentials = env.system_env_json.VCAP_SERVICES?.xsuaa[0]?.credentials ?? {}
+    const { url, clientid, clientsecret, certurl, certificate, key } = xsuaaCredentials
+    if (!url) throw new Error('No XSUAA service found in the environment of ' + app)
+
+    const auth = certificate ? { maxRedirects: 0, httpsAgent: new https.Agent({ cert: certificate, key }) }
+                             : { auth: { username: clientid, password: clientsecret } }
+    const authUrl = `${certurl ?? url}/oauth/token`
+    const data = `grant_type=client_credentials&client_id=${encodeURI(clientid)}`
+    const config = { method: 'POST', timeout: 5000, data, ...auth }
+    const { access_token } = (await axios(authUrl, config)).data
+    const approuterAuth = `x-approuter-authorization: bearer ${access_token}`
+    return [hostname, approuterAuth]
   }
 
-  #collectEndpointInfo(csn) {
-    const mapping = {}
+  #collectServiceInfo(csn, serviceInfo) {
+    const services = new Map()
+
+    const filter = cds.cli.options['filter']
 
     csn.services.map((s) => {
-      const protocols = this.#getProtocols(s)
-      const paths = this.#getPaths(s, protocols)
-
-      let entityInfo = []
-      const entities = csn.entities(s.name)
-      for (const e in entities) {
-        if (entities[e].name.endsWith('.texts')) {
-          continue
+      const sInfo = serviceInfo.find(info => info.name === s.name)
+      const urlPaths = sInfo?.endpoints?.map(e => e.path) ?? [sInfo?.urlPath]
+      if (!urlPaths) return
+      let entities = []
+      let actions = []
+
+      for (const c of csn.childrenOf(s.name)) {
+        if (c.name.match(filterStringAsRegex(filter))) {
+          if (c.name.includes('.texts')) continue
+          c.kind === 'entity' ? entities.push(this.#addNameAndReadOnly(c)) : c.kind === 'action' ? actions.push(c) : null
         }
-        entityInfo.push(this.#addNameAndReadOnly(entities[e]))
       }
-
-      mapping[s.name] = { entities: entityInfo, paths: paths, protocols: protocols, actions: [] }
+      if (entities.length === 0 && actions.length === 0) return
+      services.set(s.name, { entities, urlPaths, actions })
     })
 
-    csn.foreach('action', (a) => {
-      mapping[a.name.split(".")[0]].actions.push(a)
-    })
+    if (services.size === 0) {
+      console.error(`No services found for filter ${filter}`)
+      process.exitCode = 1
+      return
+    }
 
-    return mapping
+    return services
   }
 
-  #getProtocols(s) {
-    return s["@protocol"]
-      ? typeof s["@protocol"] === "string"
-        ? [s["@protocol"]]
-        : s["@protocol"]
-      : ["odata"]
+  #addNameAndReadOnly(e) {
+    return {
+      name: e.name,
+      readOnly: (e["@readonly"] || e["@cds.autoexpose"] || e['@odata.singleton']) ?? false,
+    }
   }
 
-  #getPaths(s, protocols) {
-    let paths = []
-    if (s["@path"]) {
-      paths.push(s["@path"])
-    } else {
-      const serviceName = s.name.replace("Service", "").toLowerCase()
-
-      let prefix = ""
-      if (protocols) {
-        for (const p of protocols) {
-          if (p === "odata-v2") {
-            prefix = "/odata/v2/"
-          } else if (p === "rest") {
-            prefix = "/rest/"
-          } else {
-            prefix = this.#defaultPathPrefix
-          }
-          paths.push(prefix + serviceName)
-        }
+  async #generatePayload(csn, services) {
+    const payload = {}
+    for (const [, service] of services) {
+      for (const e of service.entities) {
+        payload[e.name] = []
       }
     }
-    return paths
-  }
-
-  #addNameAndReadOnly(e) {
-    return {
-      name: e.name.split(".")[1],
-      readOnly: (e["@readonly"] || e["@cds.autoexpose"] || e['@odata.singleton']) ?? false,
+    // csn.all('entity').reduce((all, e) => { all[e.name] = []; return all }, {})
+    await asJson(payload, csn, 1)
+    for (const p in payload) {
+      delete payload[p][0].texts
+      delete payload[p][0].localized
     }
+    return payload
   }
 
-  #generateRequests(mapping, hostname, auth) {
-    for (const service in mapping) {
+  #generateRequests(services, hostname, auth, payload) {
+    let varsDefined = false  // when writing requests for multiple services to stdout, define vars only once
+    for (const [serviceName, service] of services) {
       let requests = []
+      if (!cds.cli.options.dry || !varsDefined) {
+        requests.push(auth ? `@server = ${hostname}\n@auth = ${auth}\n` : `@server = ${hostname}\n`)
+      }
+      varsDefined = true
+      const headers = auth ? `Content-Type: application/json\n{{auth}}` : `Content-Type: application/json`
 
-      requests.push(`@server = ${hostname}\n@auth = ${auth}\n`)
-
-      mapping[service].entities.forEach((e) => {
-        for (const path of mapping[service].paths) {
-          const url = `{{server}}${path}/${e.name}`
-          const contentType = `Content-Type: application/json`
-          const authHeader = `{{auth}}`
-
-          requests.push(`GET ${url}\n${authHeader}\n${contentType}\n`)
+      service.urlPaths.forEach((urlPath) => {
+        if (service.urlPaths.length > 1) {
+          requests.push(`\n# Service endpoint: ${urlPath}`)
+        }
 
-          if (!e.readOnly) {
-            const allHeaders = `${contentType}\n${authHeader}`
-            requests.push(`POST ${url}\n${allHeaders}\n\n{}\n`)
+        service.entities.forEach((e) => {
+          const entityNameSimple = e.name.slice(e.name.lastIndexOf('.') + 1)
+          const url = `{{server}}/${urlPath}${entityNameSimple}`
+          const requestTitle = `\n### ${e.name}`
+          requests.push(`${requestTitle}\nGET ${url}\n${headers}\n`)
+          if (e.readOnly) {
+            return
+          }
 
-            requests.push(`PATCH ${url}\n${allHeaders}\n\n{}\n`)
-            requests.push(`DELETE ${url}\n${authHeader}\n`)
+          const entityData = payload[`${e.name}`] ? payload[`${e.name}`][0] : null
+          if (!entityData) return
+          // TODO handle ids that are not named ID
+          if (!Object.keys(entityData).some(k => k === "ID")) return  // no need to write requests for entities without ids
+
+          const postBody = JSON.stringify(entityData, null, 2)
+          requests.push(`${requestTitle}\nPOST ${url}\n${headers}\n\n${postBody}\n`)
+          requests.push(`${requestTitle}\nPATCH ${url}/${entityData.ID}\n${headers}\n\n${postBody}\n`)
+          requests.push(`${requestTitle}\nDELETE ${url}/${entityData.ID}\n${headers}\n`)
+        })
+
+        service.actions.forEach((a) => {
+          const url = `{{server}}/${urlPath}${a.name.split(".")[1]}`
+
+          let actionPayload = {}
+          if (a.params) {
+            for (const [key, value] of Object.entries(a.params)) {
+              actionPayload[key] = value.type === 'cds.Integer' ? 1
+                : value.type === 'string' ? 'sample string'
+                  // TODO reference an object that has been generated
+                  : typeof value.type === 'object' && value.type.ref ? payload[value.type.ref[0]][0][value.type.ref[1]]
+                    : null
+            }
           }
-        }
+          requests.push(`\n### ${a.name}\nPOST ${url}\n${headers}\n\n${JSON.stringify(actionPayload, null, 2)}\n`)
+        })
+
       })
+      this.#write(requests, serviceName)
+    }
+  }
 
-      const outputPath = this.#determineOutputPath(service)
-      write(requests.join("\n###\n")).to(outputPath)
-      console.log(`${outputPath} has been created.`)
+  #write(requests, serviceName) {
+    const http = requests.join('\n')
+    if (cds.cli.options.dry) {
+      console.log(http)
+    } else {
+      const term = require('../../../util/term')
+      const outputPath = this.#determineOutputPath(serviceName)
+      if (exists(outputPath)) {
+        if (cds.cli.options.force) {
+          console.log(term.dim(`  Overwriting ${outputPath}`))
+        } else {
+          console.log(term.dim(`  Skipping ${outputPath}`))
+          return
+        }
+      } else {
+        console.log(term.dim(`  Creating ${outputPath}`))
+      }
+      write(http).to(outputPath)
     }
   }
 
-  #determineOutputPath(service) {
+  #determineOutputPath(serviceName) {
     let outputDir
     const { out } = cds.cli.options
     if (out) {
@@ -175,7 +221,7 @@ module.exports = class HttpTemplate extends require('../../plugin') {
     } else {
       outputDir = this.#defaultOutputDir
     }
-    return `${outputDir}/${service}.http`
+    return `${outputDir}/${serviceName}.http`
   }
 }
 

package/lib/init/template/kafka/index.js

@@ -1,3 +1,5 @@
+const cds = require('../../../cds')
+const { exists, fs, path } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, kafkaMessaging } = require('../../registries/mta')
@@ -6,6 +8,10 @@ const mvn = require('../../mvn')
 module.exports = class KafkaTemplate extends require('../../plugin') {
 
   static hasInProduction(env) {
+    if (exists('pom.xml')) {
+      if (!exists('srv/pom.xml')) return false
+      return fs.readFileSync(path.resolve(cds.root, 'srv/pom.xml'), 'utf8').includes('cds-feature-kafka')
+    }
     return !!(env.requires?.messaging?.kind === 'kafka')
   }
 

package/lib/init/template/lint/index.js

@@ -11,7 +11,7 @@ const cds = require("../../../cds");
 const { mkdirp, exists } = cds.utils;
 const IS_WIN = os.platform() === "win32";
 const VSCODE_FILE_ASSOCIATIONS = {
-  "csv": [ "csv", "csv (semicolon)", "tsv", "tab" ]
+  "csv": ["csv", "csv (semicolon)", "tsv", "tab"]
 }
 
 module.exports = class LintTemplate extends require('../../plugin') {
@@ -43,7 +43,7 @@ module.exports = class LintTemplate extends require('../../plugin') {
   }
 
   async run() {
-    // Require ESLint v>=7.0.0
+    // Require ESLint v>=8.0.0
     if (!this.isTest) {
       this._checkEslint();
     }
@@ -69,21 +69,20 @@ module.exports = class LintTemplate extends require('../../plugin') {
       // Generate VS Code extension settings
       const { getFileExtensions } = require("@sap/eslint-plugin-cds/lib/api");
       const ALLOWED_FILE_EXTENSIONS = getFileExtensions();
-        const extensions = ALLOWED_FILE_EXTENSIONS.map((ext) => {
+      const extensions = new Set(ALLOWED_FILE_EXTENSIONS.map((ext) => {
         return path.extname(ext).replace('.', '');
-      })
+      }))
       extensions.forEach((ext) => {
         if (ext in VSCODE_FILE_ASSOCIATIONS) {
           VSCODE_FILE_ASSOCIATIONS[ext].forEach((assoc) => {
-            extensions.push(assoc)
+            extensions.add(assoc)
           })
         }
       });
       await io.sanitizeVscodeSettings(
-        cds.root,
         path.join(cds.root, ".vscode/settings.json"),
         this.lintType,
-        extensions,
+        Array.from(extensions),
         this.customRuleExample
       );
     }
@@ -124,8 +123,8 @@ module.exports = class LintTemplate extends require('../../plugin') {
   _checkEslint() {
     const eslintCmd = checks.resolveEslint(cds.root, '');
     if (!eslintCmd) {
-      this.missingNpmDependencies["names"].push("eslint");
-      this.missingNpmDependencies["msgs"].push("ESLint v>=7.0.0");
+      this.missingNpmDependencies["names"].push("eslint@^9");
+      this.missingNpmDependencies["msgs"].push("ESLint v>=9.0.0");
     }
     return;
   }
@@ -135,10 +134,11 @@ module.exports = class LintTemplate extends require('../../plugin') {
       "@sap/eslint-plugin-cds",
       cds.root
     );
+
     // Require locally installed ESLint CDS plugin
     if (!eslintPluginLocal) {
-      this.missingNpmDependencies["names"].push("@sap/eslint-plugin-cds");
-      this.missingNpmDependencies["msgs"].push("ESLint plugin for CDS");
+      this.missingNpmDependencies["names"].push("@sap/eslint-plugin-cds@^3.0.0");
+      this.missingNpmDependencies["msgs"].push("ESLint plugin for CDS v>=3.0.0");
     }
     return;
   }
@@ -153,10 +153,9 @@ module.exports = class LintTemplate extends require('../../plugin') {
     const { getConfigPath } = require("@sap/eslint-plugin-cds/lib/api");
     let configPath = getConfigPath(cds.root);
     if (!configPath) {
-      configPath = path.join(cds.root, ".eslintrc.json");
+      configPath = path.join(cds.root, "eslint.config.js");
     }
     await io.sanitizeEslintConfig(configPath, this.customRuleExample);
-    return;
   }
 
   async _promptInstallDependencies(task) {

package/lib/init/template/mta/files/mta.yaml.hbs

@@ -33,7 +33,7 @@ modules:
     properties:
       SPRING_PROFILES_ACTIVE: cloud,sandbox
       JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"
-      JBP_CONFIG_SAP_MACHINE_JRE: '{ use_offline_repository: false, version: 17.+ }'
+      JBP_CONFIG_SAP_MACHINE_JRE: '{ use_offline_repository: false, version: {{jdkVersion}}.+ }'
     build-parameters:
       builder: custom
       commands:

package/lib/init/template/multitenancy/files/values.yaml.hbs

@@ -7,11 +7,6 @@ srv:
     {{/isJava}}
     service-manager:
       serviceInstanceName: service-manager
-{{#hasXsuaa}}
-xsuaa:
-  parameters:
-    tenant-mode: shared
-{{/hasXsuaa}}
 service-manager:
   serviceOfferingName: service-manager
   servicePlanName: container

package/lib/init/template/multitenancy/index.js

@@ -78,7 +78,14 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
     }
 
     if (hasHelm || hasHelmUnifiedRuntime) {
-      await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
+      const overwrites = hasXsuaa ? [{
+        item: [{
+          in: 'xsuaa',
+          where: { serviceOfferingName: 'xsuaa' }
+        }, 'parameters.tenant-mode'], withValue: 'shared'
+      }] : []
+      
+      await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project, overwrites })
 
       const envFromObject = {
         envFrom: [{
@@ -100,11 +107,12 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
               }
             }
           ]
-        }}).into('chart/values.yaml', { with: project })
+        }
+      }).into('chart/values.yaml', { with: project })
 
-        await removeFromYAML(join('chart', 'values.yaml'), ['srv.expose', 'srv.networkSecurity'])
-        await copy(join(__dirname, 'files', `mtxs-configmap-${isJava ? 'java' : 'nodejs'}${hasApprouter ? '-approuter' : ''}.yaml`)).to('chart', 'templates', 'mtxs-configmap.yaml') // REVISIT: Move to build task
-        await copy(join(__dirname, 'files', 'saas-registry-secret.yaml')).to('chart', 'templates', 'saas-registry-secret.yaml') // REVISIT: Move to build task
+      await removeFromYAML(join('chart', 'values.yaml'), ['srv.expose', 'srv.networkSecurity'])
+      await copy(join(__dirname, 'files', `mtxs-configmap-${isJava ? 'java' : 'nodejs'}${hasApprouter ? '-approuter' : ''}.yaml`)).to('chart', 'templates', 'mtxs-configmap.yaml') // REVISIT: Move to build task
+      await copy(join(__dirname, 'files', 'saas-registry-secret.yaml')).to('chart', 'templates', 'saas-registry-secret.yaml') // REVISIT: Move to build task
     }
 
     if (hasXsuaa) {

package/lib/init/template/nodejs/files/.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+  // uncomment entries once all libraries have been installed via 'npm install'
+  "eslint.validate": [
+    // "cds",
+    // "csn",
+    // "csv",
+    // "csv (semicolon)",
+    // "tab",
+    // "tsv"
+  ]
+}

package/lib/init/template/nodejs/files/eslint.config.js

@@ -0,0 +1,13 @@
+const cds = require('@sap/eslint-plugin-cds')
+
+module.exports = [
+  cds.configs.recommended,
+  {
+    plugins: {
+      '@sap/cds': cds
+    },
+    rules: {
+      ...cds.configs.recommended.rules
+    }
+  }
+]

package/lib/init/template/nodejs/files/package.json.hbs

@@ -10,7 +10,9 @@
     "express": "^4"
   },
   "devDependencies": {
-    "@cap-js/sqlite": "^1"
+    "@cap-js/sqlite": "^1",
+    "@sap/eslint-plugin-cds": "^3",
+    "eslint": "^9"
   },
   "scripts": {
     "start": "cds-serve"

package/lib/init/template/sample/index.js

@@ -1,33 +1,31 @@
 const { join } = require('path')
 const cds = require('../../../cds'), { exists, read, write, copy } = cds.utils
 const { env4, readProject } = require('../../projectReader')
+const mvn = require('../../mvn')
 
 module.exports = class SampleTemplate extends require('../../plugin') {
 
-    async canRun() {
-        const { isJava } = readProject()
-        if (isJava) throw `'cds add sample' is not available for Java yet`
-        return true
-    }
-
     async run() {
         const { db, srv, app } = env4('production').folders
         const language = exists('pom.xml') ? 'java' : 'nodejs'
 
-        await Promise.all([
-          copy(join(__dirname, 'files', 'db')).to(db),
-          copy(join(__dirname, 'files', 'srv')).to(srv),
-          copy(join(__dirname, 'files', language)).to(srv)
-        ])
-
-        await copy(join(__dirname, 'files', 'app')).to(app)
-        const { appName, appPath, appUIPaths } = readProject()
+        if (language === 'nodejs') {
+            await Promise.all([
+                copy(join(__dirname, 'files/db')).to(db),
+                copy(join(__dirname, 'files/srv')).to(srv)
+            ])
+            await copy(join(__dirname, 'files', language)).to(srv)
+            await copy(join(__dirname, 'files', 'app')).to(app)
+            const { appName, appPath, appUIPaths } = readProject()
 
-        // manifest.json must be unique
-        await Promise.all(appUIPaths.map(async p => {
-            const manifest = await read(join(appPath, p, 'webapp/manifest.json'))
-            manifest['sap.app'].id = appName + '.' + p
-            await write(join(appPath, p, 'webapp/manifest.json'), manifest, { spaces: 2 })
-        }))
+            // manifest.json must be unique // REVISIT: Check if relevant for `cds add sample` in Java scenario
+            await Promise.all(appUIPaths.map(async p => {
+                const manifest = await read(join(appPath, p, 'webapp/manifest.json'))
+                manifest['sap.app'].id = appName + '.' + p
+                await write(join(appPath, p, 'webapp/manifest.json'), manifest, { spaces: 2 })
+            }))
+        } else if (language === 'java') {
+            await mvn.add('sample')
+        }
     }
 }

package/lib/init/template/tiny-sample/index.js

@@ -11,8 +11,7 @@ module.exports = class TinySampleTemplate extends require('../../plugin') {
         const { isJava } = readProject()
         if (isJava) {
             if (!cds.cli.options.add.has(JAVA)) {
-                await mvn.execMvn(mvn.getAddSamplesCmdArgs())
-                await mvn.execMvn(mvn.getAddTestsCmdArgs())
+                await mvn.add('tiny_sample')
             }
         } else {
             const { db, srv } = env4('production').folders