diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImpl.java index 2b4f48d50511d41a5b52c5cec7a13877a2d6c238..7631df84bc348d8e3ed43dd011023fb9aabe8002 100644 --- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImpl.java +++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImpl.java @@ -49,16 +49,10 @@ public class SchemaToStorageFormatImpl implements SchemaToStorageFormat { @Inject public SchemaToStorageFormatImpl(ObjectMapper objectMapper, JaxRsDpsLog log, SchemaConverterConfig schemaConverterConfig) { - this(objectMapper, log, schemaConverterConfig, null); - } - - public SchemaToStorageFormatImpl(ObjectMapper objectMapper, JaxRsDpsLog log, SchemaConverterConfig schemaConverterConfig, - VirtualPropertiesSchemaCache virtualPropertiesSchemaCache) { Preconditions.checkNotNull(objectMapper, "objectMapper cannot be null"); this.objectMapper = objectMapper; this.schemaConverterConfig = schemaConverterConfig; - if (virtualPropertiesSchemaCache != null) this.virtualPropertiesSchemaCache = virtualPropertiesSchemaCache; } @Override diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImplTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImplTest.java index a7769064ff46e758e9de7a0ad1e2a10f6d078348..80bd8fcfece51977eff26f7b0630ed8ba8e58544 100644 --- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImplTest.java +++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/schema/converter/SchemaToStorageFormatImplTest.java @@ -33,8 +33,10 @@ import static org.opengroup.osdu.indexer.config.IndexerConfigurationProperties.M import org.springframework.context.annotation.Configuration; import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.util.ReflectionUtils; import java.io.IOException; +import java.lang.reflect.Field; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -76,7 +78,10 @@ public class SchemaToStorageFormatImplTest { schemaConverterPropertiesConfig = new SchemaConverterPropertiesConfig(featureFlag, partitionFlagClient); schemaToStorageFormatImpl = new SchemaToStorageFormatImpl(objectMapper, jaxRsDpsLog, - schemaConverterPropertiesConfig, virtualPropertiesSchemaCache); + schemaConverterPropertiesConfig); + Field field = ReflectionUtils.findField(SchemaToStorageFormatImpl.class, "virtualPropertiesSchemaCache"); + field.setAccessible(true); + ReflectionUtils.setField(field, schemaToStorageFormatImpl, virtualPropertiesSchemaCache); } @Test diff --git a/provider/indexer-azure/src/main/resources/application.properties b/provider/indexer-azure/src/main/resources/application.properties index 5a84c72c3a56d16fd1944fc5ab9c564fa8185307..bbb3c57d723137732ef9de45cd0a4ee0b2de74bb 100644 --- a/provider/indexer-azure/src/main/resources/application.properties +++ b/provider/indexer-azure/src/main/resources/application.properties @@ -105,7 +105,7 @@ redis.database=${REDIS_DATABASE} # Feature flag settings featureFlag.strategy=${featureFlag_appProperty:appProperty} -featureFlag.mapBooleanToString.enabled=${featureFlag_mapBooleanToString_enabled:false} +featureFlag.mapBooleanToString.enabled=${featureFlag_mapBooleanToString_enabled:true} featureFlag.asIngestedCoordinates.enabled=${featureFlag_asIngestedCoordinates_enabled:true} featureFlag.keywordLower.enabled=${featureFlag_keywordLower_enabled:true} featureFlag.bagOfWords.enabled=${featureFlag_bagOfWords_enabled:true} @@ -118,4 +118,4 @@ api.server.fullUrl.enabled=${swaggerFullUrlEnabled:true} azure.storage.client.retry.MAX_ATTEMPTS=3 azure.storage.client.retry.INITIAL_DELAY=1000 -elasticsearch.client.cache.size=100 \ No newline at end of file +elasticsearch.client.cache.size=100