Commit fabd3433 authored by Dmitriy Novikov's avatar Dmitriy Novikov
Browse files

Updated properties value

parent 15063244
......@@ -20,12 +20,14 @@ package org.opengroup.osdu.indexer.config;
import lombok.Getter;
import lombok.Setter;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@Configuration
@ConfigurationProperties(prefix = "osdu.entitlements")
@Setter
@Getter
@ConfigurationProperties(prefix = "osdu.entitlements")
public class EntitlementsProperties {
private String url;
private String appKey;
}
}
\ No newline at end of file
......@@ -20,10 +20,12 @@ package org.opengroup.osdu.indexer.config;
import lombok.Getter;
import lombok.Setter;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@Configuration
@ConfigurationProperties
@Setter
@Getter
@ConfigurationProperties
public class IndexerConfigProperties {
private String recordsTopicName;
......
......@@ -2,7 +2,6 @@ package org.opengroup.osdu.indexer.di;
import java.util.List;
import javax.inject.Inject;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.core.common.logging.audit.AuditPayload;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
import org.opengroup.osdu.indexer.logging.AuditEvents;
......@@ -14,7 +13,7 @@ import org.springframework.stereotype.Component;
/**
* Prototype spring bean overriding @RequestScope AuditLogger
*/
@Component
@Component("gcpAuditLogger")
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
@Primary
public class AuditLogger {
......
......@@ -29,6 +29,7 @@ import org.opengroup.osdu.core.common.logging.LogUtils;
import org.opengroup.osdu.core.common.logging.audit.AuditPayload;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
import org.opengroup.osdu.core.common.model.http.Request;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.annotation.Primary;
......@@ -38,7 +39,7 @@ import org.springframework.stereotype.Component;
/**
* Prototype spring bean overriding @RequestScope JaxRsDpsLog
*/
@Component
@Component("gcpJaxRsDpsLog")
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
@Primary
public class JaxRsDpsLog implements AutoCloseable {
......
......@@ -16,7 +16,7 @@ import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentType;
import org.opengroup.osdu.core.common.Constants;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.indexer.di.JaxRsDpsLog;
import org.opengroup.osdu.core.common.model.entitlements.Acl;
import org.opengroup.osdu.core.common.model.http.AppException;
import org.opengroup.osdu.core.common.model.indexer.IndexSchema;
......
......@@ -29,7 +29,7 @@ import lombok.RequiredArgsConstructor;
import org.apache.http.HttpStatus;
import org.elasticsearch.ElasticsearchStatusException;
import org.elasticsearch.client.RestHighLevelClient;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.indexer.di.JaxRsDpsLog;
import org.opengroup.osdu.core.common.model.http.AppException;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
import org.opengroup.osdu.core.common.model.indexer.IndexingStatus;
......
......@@ -8,13 +8,13 @@ import org.elasticsearch.action.bulk.BulkRequest;
import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.common.unit.TimeValue;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.core.common.model.indexer.IndexSchema;
import org.opengroup.osdu.core.common.model.indexer.JobStatus;
import org.opengroup.osdu.core.common.model.indexer.OperationType;
import org.opengroup.osdu.core.common.model.indexer.RecordIndexerPayload;
import org.opengroup.osdu.core.common.model.indexer.Records;
import org.opengroup.osdu.core.common.search.ElasticIndexNameResolver;
import org.opengroup.osdu.indexer.di.JaxRsDpsLog;
import org.opengroup.osdu.indexer.util.ElasticClientHandler;
import org.springframework.stereotype.Service;
......
#
# Copyright 2022 Google LLC
# Copyright 2022 EPAM Systems, Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
oqmDriver=rabbitmq
service.token.provider=OPENID
partition-auth-enabled=false
......
#
# Copyright 2022 Google LLC
# Copyright 2022 EPAM Systems, Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
oqmDriver=pubsub
service.token.provider=GCP
partition-auth-enabled=true
......
#
# Copyright 2022 Google LLC
# Copyright 2022 EPAM Systems, Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
google-audiences=910532732700-dr68u50aj533m7poq7a0cj404n30sps0.apps.googleusercontent.com
logging.level.org.springframework.web=DEBUG
LOG_LEVEL=DEBUG
oqmDriver=pubsub
service.token.provider=GCP
partition-auth-enabled=true
indexer.task.enable=false
# external services
REDIS_GROUP_PORT=6379
REDIS_GROUP_HOST=127.0.0.1
REDIS_SEARCH_PORT=6379
REDIS_SEARCH_HOST=127.0.0.1
PARTITION_API=https://dev2.gcp.gnrg-osdu.projects.epam.com/api/partition/v1
AUTHORIZE_API=https://dev2.gcp.gnrg-osdu.projects.epam.com/api/entitlements/v2
STORAGE_API=https://dev2.gcp.gnrg-osdu.projects.epam.com/api/storage/v2
STORAGE_QUERY_KINDS_HOST=${STORAGE_API}/query/kinds
STORAGE_QUERY_RECORD_FOR_CONVERSION_HOST=${STORAGE_API}/query/records:batch
STORAGE_QUERY_RECORD_HOST=${STORAGE_API}/query/records
STORAGE_SCHEMA_HOST=${STORAGE_API}/schemas
SCHEMA_HOST=https://dev2.gcp.gnrg-osdu.projects.epam.com/api/schema-service/v1/schema
INDEXER_QUEUE_HOST=https://dev2.gcp.gnrg-osdu.projects.epam.com/api/indexer-queue/v1/
\ No newline at end of file
#server config
#
# Copyright 2022 Google LLC
# Copyright 2022 EPAM Systems, Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# server config
server.port=8080
server.servlet.contextPath=/api/indexer/v2
#log config
# log config
LOG_PREFIX=indexer
logging.level.org.springframework.web=${LOG_LEVEL:DEBUG}
#jvm config
# jvm config
JAVA_OPTS=-Xms3072m -Xmx3072m
JAVA_GC_OPTS=-XX:+UseG1GC -XX:+UseStringDeduplication -XX:InitiatingHeapOccupancyPercent=45
#Default Cache Settings
# Default Cache Settings
schema-cache-expiration=60
index-cache-expiration=60
elastic-cache-expiration=1440
......@@ -23,13 +40,15 @@ kinds-redis-database=1
cron-index-cleanup-threshold-days=3
cron-empty-index-cleanup-threshold-days=7
#indexer service config
# indexer service config
records-topic-name=records
DEFAULT_DATA_COUNTRY=US
gae-service=indexer
security.https.certificate.trust=false
storage-records-by-kind-batch-size=20
storage-records-batch-size=20
# external services
REDIS_GROUP_PORT=6379
REDIS_GROUP_HOST=redis-cache-groups
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment