Skip to content
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.

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

Fix SQL config defaults and validation #3456

Merged
merged 9 commits into from
May 30, 2024

Conversation

jnsrnhld
Copy link
Collaborator

@jnsrnhld jnsrnhld commented May 29, 2024

Denkst du, es ergibt Sinn, in den Configs Konstruktoren einzuführen, die auf die default-Werte Rücksicht nehmen, z.B. so:

@Data
@Builder
public class DatabaseConfig {

	private static final String DEFAULT_PRIMARY_COLUMN = "pid";

	private Dialect dialect;

	private String databaseUsername;

	private String databasePassword;

	private String jdbcConnectionUrl;

	@Builder.Default
	private String primaryColumn = DEFAULT_PRIMARY_COLUMN;

	@JsonCreator
	public DatabaseConfig(
			@JsonProperty("dialect") Dialect dialect,
			@JsonProperty("databaseUsername") String databaseUsername,
			@JsonProperty("databasePassword") String databasePassword,
			@JsonProperty("jdbcConnectionUrl") String jdbcConnectionUrl,
			@JsonProperty("primaryColumn") String primaryColumn
	) {
		this.dialect = dialect;
		this.databaseUsername = databaseUsername;
		this.databasePassword = databasePassword;
		this.jdbcConnectionUrl = jdbcConnectionUrl;
		this.primaryColumn = (primaryColumn != null) ? primaryColumn : DEFAULT_PRIMARY_COLUMN;
	}

}

Oder gibt es dafür eine elegantere Lösung? Mir war das vorher nicht so klar, dass Jackson die defaults (lombok Builder.Default, aber auch statische Werte) nicht einfach übernimmt.

@thoniTUB
Copy link
Collaborator

Hey @jnsrnhld ich habe das gerade zum ersten Mal gesehen: https://projectlombok.org/features/experimental/Jacksonized

Ein Test mit:

@Data
@Jacksonized
@Builder
public class DatabaseConfig {

	private static final String DEFAULT_PRIMARY_COLUMN = "pid";

	private Dialect dialect;

	private String databaseUsername;

	private String databasePassword;

	private String jdbcConnectionUrl;

	@Builder.Default
	private String primaryColumn = DEFAULT_PRIMARY_COLUMN;
}

und

class Scratch {
	public static void main(String[] args) throws IOException {
		final DatabaseConfig databaseConfig = Jackson.MAPPER.reader().readValue("{}", DatabaseConfig.class);

		System.out.println(databaseConfig);
	}
}

printet:

DatabaseConfig(dialect=null, databaseUsername=null, databasePassword=null, jdbcConnectionUrl=null, primaryColumn=pid)

@@ -41,7 +41,7 @@ public class Table extends Labeled<TableId> implements NamespacedIdentifiable<Ta
*/
@Nullable
@JsonManagedReference
private Column primaryColum;
private Column primaryColumn;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👌

Comment on lines 5 to 9
import lombok.extern.slf4j.Slf4j;
import org.jooq.Field;
import org.jooq.impl.DSL;

@Slf4j
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sind hier logs dazugekommen? Ich sehe keinen logger im Diff

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nein, hatte ich nur zum Debugging drin und vergessen wieder raus zu nehmen.

@jnsrnhld
Copy link
Collaborator Author

Sehr cooler Fund mit dem Jacksonized!

jnsrnhld and others added 2 commits May 30, 2024 12:33
@jnsrnhld jnsrnhld enabled auto-merge (squash) May 30, 2024 10:39
@jnsrnhld jnsrnhld disabled auto-merge May 30, 2024 11:46
@jnsrnhld jnsrnhld enabled auto-merge (squash) May 30, 2024 11:46
@jnsrnhld jnsrnhld merged commit a5efb04 into develop May 30, 2024
6 checks passed
@delete-merged-branch delete-merged-branch bot deleted the sql/fix/fix-config-defaults-and-validation branch May 30, 2024 11:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants