Skip to content

SLCORE-1253 Use jooq-codegen #1551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 4, 2025
Merged

SLCORE-1253 Use jooq-codegen #1551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions backend/commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,54 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>migrate</goal>
</goals>
</execution>
</executions>
<configuration>
<url>jdbc:h2:${project.build.directory}/db/for-schema-generation.db</url>
<user>user</user>
<locations>
<location>filesystem:src/main/resources/db/migration/</location>
</locations>
</configuration>
</plugin>
<plugin>
<groupId>org.jooq</groupId>
<artifactId>jooq-codegen-maven</artifactId>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
<configuration>
<jdbc>
<driver>org.h2.Driver</driver>
<url>jdbc:h2:${project.build.directory}/db/for-schema-generation.db</url>
<user>user</user>
</jdbc>
<generator>
<database>
<name>org.jooq.meta.h2.H2Database</name>
<inputSchema>PUBLIC</inputSchema>
</database>
<target>
<packageName>org.sonarsource.sonarlint.core.commons.storage.model</packageName>
<directory>${project.build.directory}/generated-sources/jooq</directory>
</target>
</generator>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...mmons/src/main/java/org/sonarsource/sonarlint/core/commons/storage/SonarLintDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import org.jooq.impl.DSL;
import org.sonarsource.sonarlint.core.commons.log.SonarLintLogger;

import static org.sonarsource.sonarlint.core.commons.storage.generated.Tables.AI_CODEFIX_SETTINGS;
import static org.sonarsource.sonarlint.core.commons.storage.model.Tables.AI_CODEFIX_SETTINGS;

public final class SonarLintDatabase {
private static final SonarLintLogger LOG = SonarLintLogger.get();
Expand Down
35 changes: 0 additions & 35 deletions ...ommons/src/main/java/org/sonarsource/sonarlint/core/commons/storage/generated/Tables.java
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions ...g/sonarsource/sonarlint/core/commons/storage/generated/tables/AiCodeFixSettingsTable.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...n/java/org/sonarsource/sonarlint/core/commons/storage/repository/AiCodeFixRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.sonarsource.sonarlint.core.commons.storage.SonarLintDatabase;
import org.sonarsource.sonarlint.core.commons.storage.model.AiCodeFix;

import static org.sonarsource.sonarlint.core.commons.storage.generated.Tables.AI_CODEFIX_SETTINGS;
import static org.sonarsource.sonarlint.core.commons.storage.model.Tables.AI_CODEFIX_SETTINGS;

/**
* Repository for persisting and retrieving AiCodeFix entity using the local H2 database.
Expand Down
13 changes: 12 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

<properties>
<license.name>GNU LGPL v3</license.name>

<!--
Most of SonarLint Core is build using Java 17 except for the modules that
are dependencies for the SonarLint Core OSGi bundle that is used on
Expand Down Expand Up @@ -91,6 +91,7 @@
<sonar.cpd.exclusions>rpc-protocol/src/main/java/org/sonarsource/sonarlint/core/rpc/protocol/client/analysis/*Dto.java</sonar.cpd.exclusions>
<sonar.organization>sonarsource</sonar.organization>
<h2.version>2.4.240</h2.version>
<!-- More recent versions require Java 21 -->
<jooq.version>3.19.15</jooq.version>
<flyway.version>11.14.0</flyway.version>
</properties>
Expand Down Expand Up @@ -336,6 +337,16 @@
<artifactId>download-maven-plugin</artifactId>
<version>1.13.0</version>
</plugin>
<plugin>
<groupId>org.jooq</groupId>
<artifactId>jooq-codegen-maven</artifactId>
<version>${jooq.version}</version>
</plugin>
<plugin>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-maven-plugin</artifactId>
<version>${flyway.version}</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down
Loading