Skip to content
Snippets Groups Projects
Commit df4714ca authored by Yauheni Lesnikau's avatar Yauheni Lesnikau Committed by Mark Chance
Browse files

add lazy initialization for the primitiveTypesMap of the SchemaConverterPropertiesConfig

parent 469599fa
No related branches found
No related tags found
1 merge request!809Fix mapping boolean values to string
......@@ -5,9 +5,9 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import lombok.Getter;
import lombok.Setter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.opengroup.osdu.core.common.feature.IFeatureFlag;
......@@ -29,18 +29,15 @@ public class SchemaConverterPropertiesConfig implements SchemaConverterConfig {
private Set<String> processedArraysTypes;
private String defaultObjectArraysType;
@Autowired
private IFeatureFlag featureFlagChecker;
@Autowired
private BooleanFeatureFlagClient partitionFlagChecker;
private final IFeatureFlag featureFlagChecker;
private final BooleanFeatureFlagClient partitionFlagChecker;
public SchemaConverterPropertiesConfig(IFeatureFlag flag, BooleanFeatureFlagClient flagClient) {
if (flag != null) featureFlagChecker=flag;
if (flagClient != null) partitionFlagChecker=flagClient;
public SchemaConverterPropertiesConfig(IFeatureFlag featureFlagChecker, BooleanFeatureFlagClient partitionFlagChecker) {
this.featureFlagChecker = featureFlagChecker;
this.partitionFlagChecker = partitionFlagChecker;
skippedDefinitions = getDefaultSkippedDefinitions();
supportedArrayTypes = getDefaultSupportedArrayTypes();
specialDefinitionsMap = getDefaultSpecialDefinitionsMap();
primitiveTypesMap = getDefaultPrimitiveTypesMap();
processedArraysTypes = getDefaultArraysTypesForProcessing();
defaultObjectArraysType = getObjectArraysDefaultType();
}
......@@ -112,6 +109,13 @@ public class SchemaConverterPropertiesConfig implements SchemaConverterConfig {
return defaultPrimitiveTypesMap;
}
public Map<String, String> getPrimitiveTypesMap() {
if (primitiveTypesMap == null) {
primitiveTypesMap = getDefaultPrimitiveTypesMap();
}
return primitiveTypesMap;
}
private Set<String> getDefaultArraysTypesForProcessing() {
return new HashSet<>(Arrays.asList("nested"));
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment