Skip to content

Commit 8e4919d

Browse files
authored
Remove deprecated configurable LRU cache (helidon-io#11504)
1 parent 77d0fa8 commit 8e4919d

21 files changed

Lines changed: 34 additions & 364 deletions

File tree

common/configurable/etc/spotbugs/exclude.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2021, 2024 Oracle and/or its affiliates.
4+
Copyright (c) 2021, 2026 Oracle and/or its affiliates.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -42,9 +42,4 @@
4242
<Method name="&lt;init&gt;"/>
4343
<Bug pattern = "VA_FORMAT_STRING_USES_NEWLINE"/>
4444
</Match>
45-
<Match>
46-
<!-- deprecated, need the common to decouple from config -->
47-
<Class name="io.helidon.common.configurable.LruCache" />
48-
<Bug pattern="NM_SAME_SIMPLE_NAME_AS_INTERFACE" />
49-
</Match>
5045
</FindBugsFilter>

common/configurable/src/main/java/io/helidon/common/configurable/LruCache.java

Lines changed: 0 additions & 132 deletions
This file was deleted.

common/configurable/src/main/java/io/helidon/common/configurable/LruCacheConfigBlueprint.java

Lines changed: 0 additions & 39 deletions
This file was deleted.

common/configurable/src/main/resources/META-INF/native-image/io.helidon.common/helidon-common-configurable/native-image.properties

Lines changed: 0 additions & 18 deletions
This file was deleted.

common/configurable/src/test/java/io/helidon/common/configurable/LruCacheTest.java

Lines changed: 0 additions & 112 deletions
This file was deleted.

metadata/hson/src/test/java/io/helidon/metadata/hson/ExistingTypesTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2024 Oracle and/or its affiliates.
2+
* Copyright (c) 2024, 2026 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -115,7 +115,7 @@ void testConfigMetadata() throws IOException {
115115
Optional<List<Hson.Struct>> types = module.structArray("types");
116116
assertThat(types, optionalPresent());
117117
List<Hson.Struct> typesList = types.get();
118-
assertThat(typesList, hasSize(5));
118+
assertThat(typesList, hasSize(4));
119119

120120
Hson.Struct first = typesList.getFirst();
121121
assertThat(first.stringValue("annotatedType"),

metadata/hson/src/test/resources/config-metadata.json

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -218,24 +218,6 @@
218218
}
219219
]
220220
},
221-
{
222-
"annotatedType": "io.helidon.common.configurable.LruCacheConfig",
223-
"type": "io.helidon.common.configurable.LruCache",
224-
"producers": [
225-
"io.helidon.common.configurable.LruCacheConfig#create(io.helidon.config.Config)",
226-
"io.helidon.common.configurable.LruCacheConfig#builder()",
227-
"io.helidon.common.configurable.LruCache#create(io.helidon.common.configurable.LruCacheConfig)"
228-
],
229-
"options": [
230-
{
231-
"defaultValue": "10000",
232-
"description": "Configure capacity of the cache. Defaults to LruCache.DEFAULT_CAPACITY.\n\n Maximal number of records in the cache before the oldest one is removed",
233-
"key": "capacity",
234-
"method": "io.helidon.common.configurable.LruCacheConfig.Builder#capacity(int)",
235-
"type": "java.lang.Integer"
236-
}
237-
]
238-
},
239221
{
240222
"annotatedType": "io.helidon.common.configurable.ScheduledThreadPoolConfig",
241223
"type": "io.helidon.common.configurable.ScheduledThreadPoolSupplier",

security/providers/oidc/src/main/java/io/helidon/security/providers/oidc/OidcFeature.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
import java.util.stream.Collectors;
3434

3535
import io.helidon.common.HelidonServiceLoader;
36+
import io.helidon.common.LruCache;
3637
import io.helidon.common.Weight;
37-
import io.helidon.common.configurable.LruCache;
3838
import io.helidon.common.context.Context;
3939
import io.helidon.common.context.Contexts;
4040
import io.helidon.common.mapper.OptionalValue;

security/providers/oidc/src/main/java/io/helidon/security/providers/oidc/OidcProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import java.util.stream.Collectors;
3131

3232
import io.helidon.common.HelidonServiceLoader;
33-
import io.helidon.common.configurable.LruCache;
33+
import io.helidon.common.LruCache;
3434
import io.helidon.common.parameters.Parameters;
3535
import io.helidon.config.Config;
3636
import io.helidon.config.metadata.Configured;

webclient/api/src/main/java/io/helidon/webclient/api/HttpClientRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, 2025 Oracle and/or its affiliates.
2+
* Copyright (c) 2023, 2026 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
2121
import java.util.Map;
2222
import java.util.Optional;
2323

24-
import io.helidon.common.configurable.LruCache;
24+
import io.helidon.common.LruCache;
2525
import io.helidon.common.socket.HelidonSocket;
2626
import io.helidon.http.Method;
2727
import io.helidon.webclient.spi.HttpClientSpi;

0 commit comments

Comments
 (0)