Skip to content

Set options to allow extra or missing fields in constructor rather than init() #511

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

Open
absurdfarce wants to merge 1 commit into
base: 1.x
Choose a base branch
from
Open

Set options to allow extra or missing fields in constructor rather than init() #511

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
12 changes: 10 additions & 2 deletions ...mmons/src/main/java/com/datastax/oss/dsbulk/workflow/commons/settings/SchemaSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,16 @@ public class SchemaSettings {
public SchemaSettings(Config config, SchemaGenerationStrategy schemaGenerationStrategy) {
this.config = config;
this.schemaGenerationStrategy = schemaGenerationStrategy;

/* Issue 502
*
* We set these two values early because (a) they're entirely driven by settings in the HOCON config and
* (b) they're exposed via accessor methods below (isAllowExtraFields and isAllowMissingFields). To avoid
* any order-of-operations issues in which a SchemaSettings instance may have been created (but not yet
* initialized) and these values are accessed we set them as early as possible here.
*/
allowExtraFields = config.getBoolean(ALLOW_EXTRA_FIELDS);
allowMissingFields = config.getBoolean(ALLOW_MISSING_FIELDS);
}

public void init(
Expand Down Expand Up @@ -470,8 +480,6 @@ public void init(
// Misc

nullToUnset = config.getBoolean(NULL_TO_UNSET);
allowExtraFields = config.getBoolean(ALLOW_EXTRA_FIELDS);
allowMissingFields = config.getBoolean(ALLOW_MISSING_FIELDS);
splits = ConfigUtils.getThreads(config, SPLITS);

// Final checks related to graph operations
Expand Down