diff --git a/NOTICE b/NOTICE index cb3f229d1b7063b091a9453d14efd56967d6ceb4..680f64b0217dba31852feaf302db916f00852030 100644 --- a/NOTICE +++ b/NOTICE @@ -193,24 +193,15 @@ The following software have components provided under the terms of this license: - MongoDB Driver (from https://www.mongodb.com/) - MongoDB Java Driver (from http://mongodb.org/, http://www.mongodb.org, https://www.mongodb.com/) - Netty Reactive Streams Implementation (from https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams) -- Netty/All-in-One (from https://netty.io/netty-all/, https://repo1.maven.org/maven2/io/netty/netty-all) - Netty/Buffer (from https://repo1.maven.org/maven2/io/netty/netty-buffer) - Netty/Codec (from https://repo1.maven.org/maven2/io/netty/netty-codec) - Netty/Codec/DNS (from https://repo1.maven.org/maven2/io/netty/netty-codec-dns) -- Netty/Codec/HAProxy (from https://repo1.maven.org/maven2/io/netty/netty-codec-haproxy) - Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http) - Netty/Codec/HTTP2 (from https://repo1.maven.org/maven2/io/netty/netty-codec-http2) -- Netty/Codec/MQTT (from https://repo1.maven.org/maven2/io/netty/netty-codec-mqtt) -- Netty/Codec/Memcache (from https://repo1.maven.org/maven2/io/netty/netty-codec-memcache) -- Netty/Codec/Redis (from https://repo1.maven.org/maven2/io/netty/netty-codec-redis) -- Netty/Codec/SMTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-smtp) - Netty/Codec/Socks (from https://repo1.maven.org/maven2/io/netty/netty-codec-socks) -- Netty/Codec/Stomp (from https://repo1.maven.org/maven2/io/netty/netty-codec-stomp) -- Netty/Codec/XML (from https://repo1.maven.org/maven2/io/netty/netty-codec-xml) - Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common) - Netty/Handler (from https://repo1.maven.org/maven2/io/netty/netty-handler) - Netty/Handler/Proxy (from https://repo1.maven.org/maven2/io/netty/netty-handler-proxy) -- Netty/Handler/Ssl/Ocsp (from https://repo1.maven.org/maven2/io/netty/netty-handler-ssl-ocsp) - Netty/Incubator/Codec/Classes/Quic (from <https://repo1.maven.org/maven2/io/netty/incubator/netty-incubator-codec-classes-quic>, https://repo1.maven.org/maven2/io/netty/incubator/netty-incubator-codec-classes-quic) - Netty/Resolver (from https://repo1.maven.org/maven2/io/netty/netty-resolver) - Netty/Resolver/DNS (from https://repo1.maven.org/maven2/io/netty/netty-resolver-dns) @@ -221,9 +212,6 @@ The following software have components provided under the terms of this license: - Netty/Transport/Classes/Epoll (from https://repo1.maven.org/maven2/io/netty/netty-transport-classes-epoll) - Netty/Transport/Classes/KQueue (from https://repo1.maven.org/maven2/io/netty/netty-transport-classes-kqueue) - Netty/Transport/Native/Unix/Common (from https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common) -- Netty/Transport/RXTX (from https://repo1.maven.org/maven2/io/netty/netty-transport-rxtx) -- Netty/Transport/SCTP (from https://repo1.maven.org/maven2/io/netty/netty-transport-sctp) -- Netty/Transport/UDT (from https://repo1.maven.org/maven2/io/netty/netty-transport-udt) - Nimbus Content Type (from https://bitbucket.org/connect2id/nimbus-content-type) - Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt, https://bitbucket.org/nimbusds/nimbus-jose-jwt) - Nimbus LangTag (from https://bitbucket.org/connect2id/nimbus-language-tags) @@ -428,7 +416,6 @@ The following software have components provided under the terms of this license: - Apache Lucene (module: suggest) (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-suggest) - AspectJ Weaver (from http://www.aspectj.org, https://www.eclipse.org/aspectj/) - Class Model for Hk2 (from https://repo1.maven.org/maven2/org/glassfish/hk2/class-model) -- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el) - FindBugs-jsr305 (from http://findbugs.sourceforge.net/) - GAX (Google Api eXtensions) for Java (Core) (from https://github.com/googleapis, https://github.com/googleapis/gax-java, https://repo1.maven.org/maven2/com/google/api/gax) - GAX (Google Api eXtensions) for Java (gRPC) (from <https://repo1.maven.org/maven2/com/google/api/gax-grpc>, https://repo1.maven.org/maven2/com/google/api/gax-grpc) @@ -597,7 +584,6 @@ The following software have components provided under the terms of this license: - ${project.groupId}:${project.artifactId} (from https://repo1.maven.org/maven2/org/locationtech/jts/io/jts-io-common) - AspectJ Weaver (from http://www.aspectj.org, https://www.eclipse.org/aspectj/) -- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) - JUnit Jupiter API (from http://junit.org/junit5/, https://junit.org/junit5/) - JUnit Jupiter Engine (from http://junit.org/junit5/, https://junit.org/junit5/) @@ -627,7 +613,6 @@ The following software have components provided under the terms of this license: - AspectJ Weaver (from http://www.aspectj.org, https://www.eclipse.org/aspectj/) - Class Model for Hk2 (from https://repo1.maven.org/maven2/org/glassfish/hk2/class-model) -- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el) - HK2 API module (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-api) - HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils) - HK2 core module (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-core) @@ -665,7 +650,6 @@ GPL-2.0-only The following software have components provided under the terms of this license: - Class Model for Hk2 (from https://repo1.maven.org/maven2/org/glassfish/hk2/class-model) -- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el) - Expression Language 3.0 API (from http://uel-spec.java.net, http://uel.java.net) - HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils) - HK2 core module (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-core) @@ -729,7 +713,6 @@ GPL-3.0-only ======================================================================== The following software have components provided under the terms of this license: -- Expression Language 3.0 (from http://el-spec.java.net, http://uel.java.net, https://projects.eclipse.org/projects/ee4j.el) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) - null (from https://github.com/fge/jackson-coreutils) diff --git a/provider/search-azure/src/main/java/org/opengroup/osdu/search/provider/azure/config/cache/RedisConfig.java b/provider/search-azure/src/main/java/org/opengroup/osdu/search/provider/azure/config/cache/RedisConfig.java index 7ae0ba32d3cb48b9a2bc4455c7af5d586bffed0a..eebcc93c82a5a39fc31c39f814dd6eb701a9a43b 100644 --- a/provider/search-azure/src/main/java/org/opengroup/osdu/search/provider/azure/config/cache/RedisConfig.java +++ b/provider/search-azure/src/main/java/org/opengroup/osdu/search/provider/azure/config/cache/RedisConfig.java @@ -34,6 +34,9 @@ public class RedisConfig { @Value("${redis.expiration}") private int expiration; + @Value("${redis.group.ttl:30}") + public int groupRedisTtl; + @Value("${redis.database}") private int database; @@ -47,7 +50,7 @@ public class RedisConfig { private int commandTimeout; @Bean public RedisAzureCache<String, Groups> groupCache() { - return new RedisAzureCache<>(String.class, Groups.class, new RedisAzureConfiguration(database, expiration, port, timeout, commandTimeout)); + return new RedisAzureCache<>(String.class, Groups.class, new RedisAzureConfiguration(database, groupRedisTtl, port, timeout, commandTimeout)); } @Bean