Skip to content

Commit 789e1fd

Browse files
authored
Sonar recommendations (#32057)
1 parent fa57161 commit 789e1fd

File tree

7 files changed

+12
-14
lines changed

7 files changed

+12
-14
lines changed

cli/commands.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ const defaultCommands = {
9696
alias: 'import-jdl',
9797
desc: `Create entities from the JDL file/URL/content passed in argument.
9898
Use the '--interactive' flag to generate multiple applications in series.`,
99-
help: `
99+
help: String.raw`
100100
Arguments:
101101
jdlFiles # The JDL file names or URL Type: String[] Required: true if --inline is not set
102102
@@ -106,7 +106,7 @@ const defaultCommands = {
106106
jhipster jdl https://gist.githubusercontent.com/user/path/app.jdl
107107
jhipster jdl jdl-name-from-jdl-samples-repo.jdl (just pass any file name from https://github.com/jhipster/jdl-samples)
108108
jhipster jdl --inline "application { config { baseName jhapp, testFrameworks [cypress] }}"
109-
jhipster jdl --inline \\
109+
jhipster jdl --inline \
110110
"application {
111111
config {
112112
baseName jhapp,

cli/jhipster-command.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ export default class JHipsterCommand extends Command {
180180
}
181181
cmdString = `${cmdString}${longOption}`;
182182
if (optionDefinition.type === Array) {
183-
cmdString = optionDefinition.required !== false ? `${cmdString} <value...>` : `${cmdString} [value...]`;
183+
cmdString = optionDefinition.required === false ? `${cmdString} [value...]` : `${cmdString} <value...>`;
184184
} else if (optionDefinition.type && optionDefinition.type !== Boolean) {
185-
cmdString = optionDefinition.required !== false ? `${cmdString} <value>` : `${cmdString} [value]`;
185+
cmdString = optionDefinition.required === false ? `${cmdString} [value]` : `${cmdString} <value>`;
186186
}
187187
// Passing default to `commander` (`.default(optionDefinition.default)`), will set at options passed to initial generator, so it's used in entire generation process.
188188
// We want default value to be set on jhipster options parsing so ignore default at commander.

cli/program.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ export const buildCommands = ({
252252
program
253253
.command(cmdName, '', { isDefault: cmdName === defaultCommand, hidden: Boolean(removed) })
254254
.description(desc + (blueprint ? chalk.yellow(` (blueprint: ${blueprint})`) : ''))
255-
.addCommandArguments(argument!)
255+
.addCommandArguments(argument)
256256
.addCommandOptions(commandOptions)
257257
.addHelpText('after', commandHelp!)
258258
.addAlias(alias!)

generators/angular/generator.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,10 @@ export default class AngularGenerator extends AngularApplicationGenerator {
278278
let returnValue: string | undefined;
279279
if (fieldTsDefaultValue !== undefined || defaultValue !== undefined) {
280280
let fieldDefaultValue;
281-
if (fieldTsDefaultValue !== undefined) {
282-
fieldDefaultValue = fieldTsDefaultValue;
283-
} else {
281+
if (fieldTsDefaultValue === undefined) {
284282
fieldDefaultValue = defaultValue;
283+
} else {
284+
fieldDefaultValue = fieldTsDefaultValue;
285285
}
286286

287287
fieldDefaultValue = String(fieldDefaultValue).replace(/'/g, String.raw`\'`);

generators/app/generator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export default class AppGenerator extends BaseApplicationGenerator<CommonEntity,
7676
if (!this.options.reproducible) {
7777
this.config.defaults({
7878
baseName: getDefaultAppName({ cwd: this.destinationPath() }),
79-
creationTimestamp: new Date().getTime(),
79+
creationTimestamp: Date.now(),
8080
});
8181
}
8282
},

generators/app/generators/bootstrap/generator.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera
5959
get configuringEachEntity() {
6060
return this.asConfiguringEachEntityTaskGroup({
6161
configureFields({ entityName, entityConfig }) {
62-
if (entityConfig.name === undefined) {
63-
entityConfig.name = entityName;
64-
}
62+
entityConfig.name ??= entityName;
6563

6664
entityConfig.fields!.forEach((field: CommonField) => {
6765
const { fieldName, fieldType, fieldValidateRules } = field;

generators/base/support/timestamp.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export function parseChangelog(changelogDate: string): Date {
7171
const day = zeroFallback(changelogDate.substring(6, 8), '01');
7272
const formattedDate = `${year}-${month}-${day}T${changelogDate.substring(8, 10)}:${changelogDate.substring(10, 12)}:${changelogDate.substring(12, 14)}+00:00`;
7373
const parsedTimestamp = Date.parse(formattedDate);
74-
if (isNaN(parsedTimestamp)) {
74+
if (Number.isNaN(parsedTimestamp)) {
7575
throw new Error(`changelogDate ${changelogDate} is not a valid date.`);
7676
}
7777
return new Date(parsedTimestamp);
@@ -89,7 +89,7 @@ export const parseCreationTimestamp = (creationTimestampOption: string): number
8989
if (!creationTimestamp) {
9090
return undefined;
9191
}
92-
if (creationTimestamp > new Date().getTime()) {
92+
if (creationTimestamp > Date.now()) {
9393
throw new Error(`Creation timestamp should not be in the future: ${creationTimestampOption}.`);
9494
}
9595
}

0 commit comments

Comments
 (0)