Migrate to 6.1 with retro compatibility #123
Conversation
lh-lilahamel
changed the title
pom.xml
Outdated
| <atoti-server.version>6.0.10</atoti-server.version> | ||
| <atoti-ui.version>5.1.13</atoti-ui.version> | ||
| <atoti-server.version>6.1.3-SNAPSHOT</atoti-server.version> | ||
| <atoti-ui.version>5.2.0-beta</atoti-ui.version> |
There was a problem hiding this comment.
You should not have to set the UI version anymore. Using the starters, we remove this need
| @@ -38,7 +37,7 @@ public class MacSpringBootApp { | |||
|
|
|||
| /* Before anything else we statically initialize the Quartet FS Registry. */ | |||
| static { | |||
| Registry.setContributionProvider(new ClasspathContributionProvider()); | |||
| Registry.initialize(Registry.RegistryContributions.builder().build()); | |||
There was a problem hiding this comment.
Let's use a spring event trigger as done in the sandbox
There was a problem hiding this comment.
Let's remove this, the starter for UI will handle it for us
|
|
||
| @Override | ||
| public List<String> getAllowedOrigins() { | ||
| return Collections.singletonList(env.getRequiredProperty(ACTIVEUI_ADDRESS)); |
There was a problem hiding this comment.
Let's expect this not to be set
| */ | ||
| public AnalysisDatastoreFeeder(final String dumpName) { | ||
| public AnalysisDatastoreFeeder(final String dumpName, IInternalDatastore datastore) { |
There was a problem hiding this comment.
Let's see how to not depend on the internal class
| @@ -584,7 +584,7 @@ public boolean equals(Object obj) { | |||
|
|
|||
| @Override | |||
| public String toString() { | |||
| return QfsArrays.join(", ", this.fieldNames).toString(); | |||
| return ArrayUtil.join(", ", this.fieldNames).toString(); | |||
There was a problem hiding this comment.
We could even use the native java mehtod
| @@ -331,7 +334,7 @@ void createApplication( | |||
| } | |||
|
|
|||
| void createMinimalApplication( | |||
| final ThrowingLambda.ThrowingBiConsumer<IDatastore, IActivePivotManager> actions) { | |||
| final ThrowingLambda.ThrowingBiConsumer<IInternalDatastore, IActivePivotManager> actions) { | |||
There was a problem hiding this comment.
Same here: let's see if we can use the public datastore
|
|
||
| @BeforeAll | ||
| public static void setupRegistry() { | ||
| Registry.setContributionProvider(new ClasspathContributionProvider()); | ||
| Registry.initialize(Registry.RegistryContributions.builder().build()); |
There was a problem hiding this comment.
Let's only scan the classes contributed by this project
| * @throws Exception in case of error | ||
| */ | ||
| @Autowired | ||
| public void configureGlobal( |
| @Bean | ||
| @Order(1) | ||
| public SecurityFilterChain activeUiSecurity(final HttpSecurity http, final JwtFilter jwtFilter) | ||
| throws Exception { |
There was a problem hiding this comment.
We can now drop these rules
* Move compatibility check to Java * Remove compatibility-check leftovers in CI * Use JDK21 on CI and update to 6.1.3 * Update fmt-maven-plugin to the version used in activepivot (which supports Java 21)
|
Waiting on this PR https://github.com/activeviam/activepivot/pull/11696
CI Checklist