@dsivd/prestations-ng 18.0.0-beta.7 → 18.0.0-beta.9

package/UPGRADING_V18.md

@@ -68,11 +68,13 @@ providers: [
             }
 ```
 
+Continue with your migration:
+
 ```bash
 ng update @fortawesome/angular-fontawesome@0.15 --force
 ```
 
-**NB: If your project has `@angular/cdk`**
+**NB: When using `@angular/cdk` in your project**
 
 ```bash
 ng update @angular/cdk@18
@@ -106,12 +108,18 @@ When asked the question "Select the migrations that you'd like to run", accept "
 ng update @angular-eslint/builder@19
 ```
 
-**NB: If your project has `@angular/cdk`**
+**NB: When using `@angular/cdk` in your project**
 
 ```bash
 ng update @angular/cdk@19
 ```
 
+**NB: When using `ngx-matomo-client` in your project**
+
+```bash
+ng update ngx-matomo-client@7
+```
+
 Continue with your migration:
 
 ```bash
@@ -197,6 +205,28 @@ In your `app.module.ts` file:
 })
 ```
 
+#### Matomo migration as standalone (if you are using it in your project)
+
+In your `app.module.ts` file:
+
+- Remove `import { MatomoInitializationMode, MatomoModule } from 'ngx-matomo-client';`
+- Remove `MatomoModule.forRoot({mode: MatomoInitializationMode.AUTO_DEFERRED})` from `imports` in `@NgModule(...)`
+- Add `provideMatomo` to `imports` in `@NgModule(...)`
+- Add `provideMatomo({ mode: 'deferred' })` to `providers` in `@NgModule(...)`
+
+```diff
+- import { MatomoInitializationMode, MatomoInitializerService, MatomoModule } from 'ngx-matomo-client';
++ import { MatomoInitializerService, provideMatomo } from 'ngx-matomo-client';
+
+@NgModule({
+    imports: [
+-       MatomoModule.forRoot({mode: MatomoInitializationMode.AUTO_DEFERRED}),
+    ], providers: [
++       provideMatomo({ mode: 'deferred' })
+    ]
+})
+```
+
 #### Move and update your tsconfig\*.json files
 
 - Move your `tsconfig.app.json` and `tsconfig.spec.json` from `src` to `front` (if not already done)
@@ -361,7 +391,9 @@ Finally check if your tests run well :
 ```bash
 npm run test
 ```
+
 **NB: If you are having trouble finding puppeteer ChromiumHeadless binary**
+
 ```bash
 npx puppeteer browsers install chrome
 npm run test
@@ -374,6 +406,145 @@ in your `app.component.spec.ts` file, add `HttpClientTestingModule` to `TestBed.
 
 From here on, we are back in the root folder of your project
 
+### Openshift
+
+Since spring boot 3 has a minimal jdk version of 17, you now have to deploy you application in an openshift cluster.
+see https://dsigit.etat-de-vaud.ch/outils/git/projects/PEE/repos/imt-charts/browse/README.MD
+
+### Spring boot 3
+
+You can use this openrewrite recipe to simplify the migration (run with java 11)
+
+```bash
+mvn -U org.openrewrite.maven:rewrite-maven-plugin:run -Drewrite.recipeArtifactCoordinates=org.openrewrite.recipe:rewrite-spring:RELEASE -Drewrite.activeRecipes=org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_4 -Drewrite.exportDatatables=true -Pnof,noft
+```
+
+After that, you should continue based on your current parent :
+
+### SPRING-BOOT-STARTER-PARENT
+
+- remove this profile `<id>devex.in</id>` and its properties (`<devex*`)
+- set property `java.version` to `21`
+- set property `build.nofront` to `false`
+- set property `skipTests` to `false`
+- set property `commons-lang3.version` to `3.17.0`
+- set property `commons-io.version` to `2.19.0`
+- set property `commons-text.version` to `1.13.1`
+- set property `prestations-be.version` to `18.x.y`
+- remove plugin `maven-assembly-plugin` and its properties (`<assembly.xxx`)
+- remove dependency `spring-cloud-starter-netflix-eureka-client`
+- remove dependency `javax.el` and its property (`<javax.el.version>`)
+
+If you used `org.jvnet.jaxb2.maven2:maven-jaxb2-plugin`, you should replace it with `org.jvnet.jaxb:jaxb-maven-plugin`
+
+```
+<plugin>
+    <groupId>org.jvnet.jaxb</groupId>
+    <artifactId>jaxb-maven-plugin</artifactId>
+    <version>${jaxb-maven-plugin.version}</version>
+    <configuration>
+        <strict>false</strict> <!-- see https://github.com/highsource/maven-jaxb2-plugin/wiki/Catalogs-in-Strict-Mode -->
+        <schemaDirectory>${basedir}/src/main/resources/xsd/</schemaDirectory>
+        <args>
+            <arg>-extension</arg>
+            <arg>-Xvalue-constructor</arg>
+            <arg>-XsimpleEquals</arg>
+            <arg>-XsimpleHashCode</arg>
+            <arg>-Xinheritance</arg>
+        </args>
+    </configuration>
+    <executions>
+        <execution>
+            <goals>
+                <goal>generate</goal>
+            </goals>
+            <configuration>
+                <schemaIncludes>
+                    <include>backoffice.xsd</include>
+                </schemaIncludes>
+            </configuration>
+        </execution>
+    </executions>
+    <dependencies>
+        <dependency>
+            <groupId>org.jvnet.jaxb</groupId>
+            <artifactId>jaxb-plugins</artifactId>
+            <version>${jaxb-plugins.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jvnet.jaxb2_commons</groupId>
+            <artifactId>jaxb2-namespace-prefix</artifactId>
+            <version>${jaxb2-namespace-prefix.version}</version>
+        </dependency>
+    </dependencies>
+</plugin>
+```
+
+with these properties :
+
+```
+<jaxb-maven-plugin.version>4.0.8</jaxb-maven-plugin.version>
+<jaxb-plugins.version>3.0.0</jaxb-plugins.version>
+<jaxb2-namespace-prefix.version>2.0</jaxb2-namespace-prefix.version>
+```
+
+### APPLICATION-PARENT
+
+- remove property `java.version` (already set to `21` in the parent)
+- if existing, remove exclusion `spring-cloud-starter-netflix-eureka-client` from `starter-prestation`
+- remove dependency `spring-boot-starter-validation` (already in `starter-prestation`)
+- remove devex properties
+
+If you used `org.jvnet.jaxb2.maven2:maven-jaxb2-plugin`, you should replace it with `org.jvnet.jaxb:jaxb-maven-plugin`
+
+```
+ <plugin>
+    <groupId>org.jvnet.jaxb</groupId>
+    <artifactId>jaxb-maven-plugin</artifactId>
+    <executions>
+        <execution>
+            <goals>
+                <goal>generate</goal>
+            </goals>
+            <configuration>
+                <schemaIncludes>
+                    <include>backoffice.xsd</include>
+                </schemaIncludes>
+            </configuration>
+        </execution>
+    </executions>
+</plugin>
+```
+
+### clean / build your project
+
+- remove the annotation `@EnableEurekaClient`
+- remove the property `eureka.client.enabled`
+- remove the property `eureka.client.serviceUrl.defaultZone` (in you configuration repository)
+- replace deprecated annotation `@MockBean` with `@MockitoBean`
+- remove deprecated field constructor `Validator validator` from `AbstractSdkController`
+- use `SdkControllerTest.getValidator()` instead of creating a `LocalValidatorFactoryBean` to build your ``
+
+build your project with java 21 :
+
+```
+mvn -U clean install -Pnof,noft
+```
+
+### Property migration
+
+run you application with this dependency :
+
+```
+<dependency>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-properties-migrator</artifactId>
+    <scope>runtime</scope>
+</dependency>
+```
+
+look for logs that indicate property you should migrate, update them and remove the dependency
+
 ### Captcha configuration
 
 - As stated in the migration guide from v16 to v17, Cybercache is responsible of the captcha turnstile verify call.
@@ -388,3 +559,44 @@ From here on, we are back in the root folder of your project
 Cookie storage is kept as before, therefore you can keep cookie related properties that starts with `recaptcha.cookie.YYY` in your properties.
 
 See [Skeleton](https://dsigit.etat-de-vaud.ch/outils/git/projects/CYBSDK/repos/skeleton/pull-requests/708/overview) for a working example
+
+### HIBERNATE
+
+## Sequences
+
+Hibernate doesn't use the default sequence anymore, you can keep using it by replacing
+
+```
+@GeneratedValue(strategy = GenerationType.SEQUENCE)
+```
+
+with
+
+```
+@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "hibernate_sequence")
+@SequenceGenerator(name = "hibernate_sequence", allocationSize = 1)
+```
+
+## Dates mapping
+
+replace `@Type(LocalDateTimeUserType.class)` by `@Convert(converter = LocalDateTimeConverter.class)`
+replace `@Type(LocalDateUserType.class)` by `@Convert(converter = LocalDateConverter.class)`
+
+### Jenkins files for Unit tests
+
+buildPipeline is not supported anymore, replace the content of jenkins>UT>JenkinsFile with :
+
+```
+@Library('devsup-library') _
+
+buildAppPipelinePodmanUT([
+        name  : 'the name of your application',
+        label : 'your slaves lable',
+        jdk   : '21',
+        node  : '20'
+])
+```
+
+### Debugging tips
+
+Spring boot 3 doesn't support calling a controller with a trailing slash, fix the url called (/api/ping != /api/ping**/**)

package/fesm2022/dsivd-prestations-ng.mjs

@@ -5285,13 +5285,15 @@ const IamInterceptorServiceExistingProvider = {
     multi: true
 };
 class PrestationsNgCoreModule {
-    constructor(injector) {
+    constructor(injector, faConfig) {
         this.injector = injector;
+        this.faConfig = faConfig;
         ServiceLocator.injector = injector;
         // do not let font-awesome add its own css as it would be rejected by CSP
         config.autoAddCss = false;
+        faConfig.autoAddCss = false;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: PrestationsNgCoreModule, deps: [{ token: i0.Injector }], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: PrestationsNgCoreModule, deps: [{ token: i0.Injector }, { token: i1$2.FaConfig }], target: i0.ɵɵFactoryTarget.NgModule }); }
     static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "19.2.14", ngImport: i0, type: PrestationsNgCoreModule, imports: [RouterModule] }); }
     static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: PrestationsNgCoreModule, providers: [
             IamInterceptorServiceExistingProvider,
@@ -5307,7 +5309,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.14", ngImpo
                         provideHttpClient(withInterceptorsFromDi())
                     ]
                 }]
-        }], ctorParameters: () => [{ type: i0.Injector }] });
+        }], ctorParameters: () => [{ type: i0.Injector }, { type: i1$2.FaConfig }] });
 
 // eslint-disable max-classes-per-file
 class SessionInfoData {