Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
Partition
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OSDU
OSDU Data Platform
System
Partition
Commits
213326fd
Commit
213326fd
authored
3 years ago
by
Kelly Zhou
Committed by
Mingyang Zhu
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
add clientOprtions to redis cache construction
parent
3672fc12
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!50
update logging library to latest, update core common library to add client option to rediscache construction
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/di/RedisConfig.java
+19
-4
19 additions, 4 deletions
...engroup/osdu/partition/provider/azure/di/RedisConfig.java
with
19 additions
and
4 deletions
provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/di/RedisConfig.java
+
19
−
4
View file @
213326fd
package
org.opengroup.osdu.partition.provider.azure.di
;
import
com.azure.security.keyvault.secrets.SecretClient
;
import
com.lambdaworks.redis.ClientOptions
;
import
com.lambdaworks.redis.SocketOptions
;
import
org.opengroup.osdu.azure.KeyVaultFacade
;
import
org.opengroup.osdu.core.common.cache.RedisCache
;
import
org.opengroup.osdu.partition.model.PartitionInfo
;
...
...
@@ -11,6 +13,7 @@ import org.springframework.context.annotation.Configuration;
import
javax.inject.Named
;
import
java.util.List
;
import
java.util.concurrent.TimeUnit
;
@Configuration
public
class
RedisConfig
{
...
...
@@ -42,12 +45,18 @@ public class RedisConfig {
@Bean
public
RedisCache
<
String
,
PartitionInfo
>
partitionServiceCache
(
@Named
(
"REDIS_HOST"
)
String
host
,
@Named
(
"REDIS_PASSWORD"
)
String
password
)
{
return
new
RedisCache
<>(
host
,
port
,
password
,
expiration
,
database
,
String
.
class
,
PartitionInfo
.
class
);
ClientOptions
clientOptions
=
ClientOptions
.
builder
()
.
socketOptions
(
SocketOptions
.
builder
().
connectTimeout
(
15
,
TimeUnit
.
SECONDS
).
build
())
.
build
();
return
new
RedisCache
<>(
host
,
port
,
password
,
expiration
,
database
,
clientOptions
,
String
.
class
,
PartitionInfo
.
class
);
}
@Bean
public
RedisCache
<
String
,
List
<
String
>>
partitionListCache
(
@Named
(
"REDIS_HOST"
)
String
host
,
@Named
(
"REDIS_PASSWORD"
)
String
password
)
{
return
new
RedisCache
(
host
,
port
,
password
,
expiration
,
database
,
String
.
class
,
List
.
class
);
ClientOptions
clientOptions
=
ClientOptions
.
builder
()
.
socketOptions
(
SocketOptions
.
builder
().
connectTimeout
(
15
,
TimeUnit
.
SECONDS
).
build
())
.
build
();
return
new
RedisCache
(
host
,
port
,
password
,
expiration
,
database
,
clientOptions
,
String
.
class
,
List
.
class
);
}
}
...
...
@@ -67,12 +76,18 @@ public class RedisConfig {
@Bean
public
RedisCache
<
String
,
PartitionInfo
>
partitionServiceCache
(
@Named
(
"REDIS_HOST"
)
String
host
)
{
return
new
RedisCache
<>(
host
,
port
,
expiration
,
database
,
String
.
class
,
PartitionInfo
.
class
);
ClientOptions
clientOptions
=
ClientOptions
.
builder
()
.
socketOptions
(
SocketOptions
.
builder
().
connectTimeout
(
15
,
TimeUnit
.
SECONDS
).
build
())
.
build
();
return
new
RedisCache
<>(
host
,
port
,
expiration
,
database
,
clientOptions
,
String
.
class
,
PartitionInfo
.
class
);
}
@Bean
public
RedisCache
<
String
,
List
<
String
>>
partitionListCache
(
@Named
(
"REDIS_HOST"
)
String
host
)
{
return
new
RedisCache
(
host
,
port
,
expiration
,
database
,
String
.
class
,
List
.
class
);
ClientOptions
clientOptions
=
ClientOptions
.
builder
()
.
socketOptions
(
SocketOptions
.
builder
().
connectTimeout
(
15
,
TimeUnit
.
SECONDS
).
build
())
.
build
();
return
new
RedisCache
(
host
,
port
,
expiration
,
database
,
clientOptions
,
String
.
class
,
List
.
class
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment