support context variables at PackageJson and Content Replacer API #9758

renanfranca · 2024-05-07T15:17:38Z

Fix #9744

...in/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemPackageJsonHandler.java

src/main/java/tech/jhipster/lite/module/domain/JHipsterModulesApplyer.java

src/main/java/tech/jhipster/lite/module/domain/packagejson/JHipsterModulePackageJson.java

...in/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemPackageJsonHandler.java

renanfranca · 2024-05-08T16:57:37Z

I still in draft because I am going to update the modules in this pull request too 🖖

renanfranca · 2024-05-08T17:09:14Z

I identified the sonar bug, and I will fix it later 👍

...ava/tech/jhipster/lite/module/infrastructure/secondary/FileSystemPackageJsonHandlerTest.java

src/main/java/tech/jhipster/lite/module/domain/packagejson/PackageJsonChanges.java

src/main/java/tech/jhipster/lite/module/domain/packagejson/JHipsterModulePackageJson.java

renanfranca · 2024-05-09T12:30:29Z

I encounter a new issue when trying to replace this target for {{projectBuildDirectory}} at AngularModuleFactory and it didn't work because it is inserted with replacer. After all, pckageJson API does not support jestSonar block.

I see two possibilities:

add support for jestSonar block
add support for replacer handle context variable and update it.

I am going to try to implement the second option because this jestSonar block is only needed at AngularModuleFactory and is not generic enough to deserve an implementation at packageJson API.

renanfranca · 2024-05-09T16:24:07Z

@murdos : I implemented add support for replacer handle context variable and update it. Depending on your review I could refactor the packageJson API. Thanks in advance and take your time 😉🖖

murdos · 2024-05-10T20:49:21Z

src/main/java/tech/jhipster/lite/module/domain/packagejson/PackageJsonData.java

@@ -0,0 +1,10 @@
+package tech.jhipster.lite.module.domain.packagejson;
+
+record PackageJsonData(


I'm really not found of this (and is the reason why I've not approved this PR earlier). It brings some unneeded coupling.
If Sonar is not happy about duplication for these pieces of code, we can disable the rule locally with a @SuppressWarning.

I'm really not found of this (and is the reason why I've not approved this PR earlier). It brings some unneeded coupling.

I can't agree more! It was only to make sonar let me go.

If Sonar is not happy about duplication for these pieces of code, we can disable the rule locally with a @SuppressWarning.

That's great news!!! I am going to revert this change and add the supresswarning!!!

I remove the need for PackageJsonChanges.java using the context from JHipsterModuleChanges. This will also address the code duplication issue identified by Sonar as a secondary benefit.

BTW: I didn't find a way to ignore sonar code duplication using @SuppressWarning. I am curious if I didn't search enough, I would like to know if you know how 😃

...in/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemPackageJsonHandler.java

…tion

…ers with context values

…lied Whereas JHipsterModulePackageJson represents the desired changes declared with module builder api. That way JHipsterModuleContext is only used for PackageJsonChanges, but not for JHipsterModulePackageJson

…sterModuleChanges and pass through parameter to who need it.

…es by injection

… at angular-core module

… at thymeleaf-template modules

…r.render method

… JHipsterModuleChanges. This will also address the code duplication issue identified by Sonar as a secondary benefit

renanfranca added area: enhancement 🔧 theme: gradle labels May 7, 2024

renanfranca self-assigned this May 7, 2024

renanfranca commented May 7, 2024

View reviewed changes

...in/java/tech/jhipster/lite/module/infrastructure/secondary/FileSystemPackageJsonHandler.java Outdated Show resolved Hide resolved

murdos reviewed May 7, 2024

View reviewed changes

renanfranca commented May 8, 2024

View reviewed changes

...ava/tech/jhipster/lite/module/infrastructure/secondary/FileSystemPackageJsonHandlerTest.java Outdated Show resolved Hide resolved

renanfranca commented May 8, 2024

View reviewed changes

src/main/java/tech/jhipster/lite/module/domain/packagejson/PackageJsonChanges.java Outdated Show resolved Hide resolved

renanfranca commented May 8, 2024

View reviewed changes

src/main/java/tech/jhipster/lite/module/domain/packagejson/JHipsterModulePackageJson.java Outdated Show resolved Hide resolved

renanfranca force-pushed the 9744-replace-hard-coded-target-path-in-package-json-with-context-value branch 2 times, most recently from 6f1ba5a to efde02c Compare May 9, 2024 11:10

renanfranca marked this pull request as ready for review May 9, 2024 16:17

renanfranca requested a review from murdos May 9, 2024 16:24

murdos reviewed May 10, 2024

View reviewed changes

renanfranca force-pushed the 9744-replace-hard-coded-target-path-in-package-json-with-context-value branch from 13ab437 to 5bfbc94 Compare May 11, 2024 00:55

renanfranca requested a review from murdos May 11, 2024 01:08

renanfranca changed the title ~~support context variables at packageJson API~~ support context variables at packageJson and Content Replacer API May 11, 2024

renanfranca force-pushed the 9744-replace-hard-coded-target-path-in-package-json-with-context-value branch from 912683e to 092d563 Compare May 11, 2024 01:17

renanfranca and others added 9 commits May 10, 2024 22:21

support context variables at packageJson API

5d443e1

fix test code indentation

53feff5

improve the code readability by encapsulate the java build tool detec…

f4e14b7

…tion

use TemplateRender instead of new implementation to replace placeHold…

aaf9705

…ers with context values

refactor by removing redundant character escape '\\}' in RegExp

d0e13d6

respect the immutability of JHipsterModulePackageJson

64ff368

Introduce PackageJsonChanges that represents actual changes to be app…

bca1d9d

…lied Whereas JHipsterModulePackageJson represents the desired changes declared with module builder api. That way JHipsterModuleContext is only used for PackageJsonChanges, but not for JHipsterModulePackageJson

fix sonar bug

d13df8f

fix sonar duplication

44381e4

renanfranca added 12 commits May 10, 2024 22:21

fix sonar duplication by using composition

d82ea2a

WIP:need to refactor: support context variables at FileSystemReplacer

411ecf8

add context with java build tool to JHipsterModuleChanges

60d8f67

remove context from ContentReplacers record and get context from JHip…

cd3ccd4

…sterModuleChanges and pass through parameter to who need it.

refactor GradleCommandHandler to use context from JHipsterModuleChang…

84b4fe1

…es by injection

refactor by moving emptyModuleContext() to JHipsterModulesFixture

594f635

replace hard coded target with projectBuildDirectory context variable…

64801e3

… at angular-core module

replace hard coded target with projectBuildDirectory context variable…

149bd82

… at thymeleaf-template modules

switch parameter orders to follow the same order from templateRendere…

f0067e4

…r.render method

undo sonar duplication fix by composition

d36c8be

remove the need for PackageJsonChanges.java by using the context from…

89396c2

… JHipsterModuleChanges. This will also address the code duplication issue identified by Sonar as a secondary benefit

refactor by remove unused constants

092d563

renanfranca changed the title ~~support context variables at packageJson and Content Replacer API~~ support context variables at PackageJson and Content Replacer API May 11, 2024

murdos approved these changes May 11, 2024

View reviewed changes

murdos merged commit a10f84d into jhipster:main May 11, 2024
35 checks passed

renanfranca deleted the 9744-replace-hard-coded-target-path-in-package-json-with-context-value branch May 11, 2024 09:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

support context variables at PackageJson and Content Replacer API #9758

support context variables at PackageJson and Content Replacer API #9758

renanfranca commented May 7, 2024

renanfranca commented May 8, 2024

renanfranca commented May 8, 2024

renanfranca commented May 9, 2024

renanfranca commented May 9, 2024

murdos May 10, 2024

renanfranca May 10, 2024

renanfranca May 11, 2024

		@@ -0,0 +1,10 @@
		package tech.jhipster.lite.module.domain.packagejson;

		record PackageJsonData(

support context variables at PackageJson and Content Replacer API #9758

support context variables at PackageJson and Content Replacer API #9758

Conversation

renanfranca commented May 7, 2024

renanfranca commented May 8, 2024

renanfranca commented May 8, 2024

renanfranca commented May 9, 2024

renanfranca commented May 9, 2024

murdos May 10, 2024

Choose a reason for hiding this comment

renanfranca May 10, 2024

Choose a reason for hiding this comment

renanfranca May 11, 2024

Choose a reason for hiding this comment