This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
commit e1f5d104323fb8f5e677e316b843fe0d864a810c Merge: a5966887 78e5a2ef Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Tue Oct 10 08:45:52 2023 -0400 Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-jcs checkstyle.xml | 291 +++++++++++---------- .../commons/jcs3/ConcurrentRemovalLoadTest.java | 8 +- .../apache/commons/jcs3/TestTCPLateralCache.java | 6 +- .../block/BlockDiskCacheConcurrentUnitTest.java | 10 +- ...BlockDiskCacheSameRegionConcurrentUnitTest.java | 8 +- ...dexedDiskCacheConcurrentNoDeadLockUnitTest.java | 8 +- .../IndexedDiskCacheConcurrentUnitTest.java | 10 +- .../indexed/IndexedDiskCacheNoMemoryUnitTest.java | 8 +- ...dexedDiskCacheSameRegionConcurrentUnitTest.java | 8 +- .../jdbc/hsql/HSQLDiskCacheConcurrentUnitTest.java | 10 +- .../tcp/LateralTCPNoDeadLockConcurrentTest.java | 8 +- .../jcs3/engine/EventQueueConcurrentLoadTest.java | 8 +- .../lru/LHMLRUMemoryCacheConcurrentUnitTest.java | 12 +- .../lru/LRUMemoryCacheConcurrentUnitTest.java | 8 +- .../utils/struct/LRUMapConcurrentUnitTest.java | 4 +- .../jcs3/jcache/extras/cdi/CacheManagerBean.java | 13 +- .../jcs3/jcache/extras/cdi/CacheProviderBean.java | 13 +- .../jcache/extras/cdi/ExtraJCacheExtension.java | 3 +- .../jcache/extras/loader/CacheLoaderAdapter.java | 5 +- .../jcache/extras/loader/CompositeCacheLoader.java | 12 +- .../jcs3/jcache/extras/web/InMemoryResponse.java | 1 + .../jcache/extras/writer/AsyncCacheWriter.java | 9 +- .../jcache/extras/writer/CacheWriterAdapter.java | 3 +- .../jcache/extras/writer/CompositeCacheWriter.java | 8 +- .../jcs3/jcache/extras/InternalCacheRule.java | 9 +- .../extras/cdi/ExtraJCacheExtensionTest.java | 12 +- .../extras/loader/CacheLoaderAdapterTest.java | 17 +- .../extras/loader/CompositeCacheLoaderTest.java | 11 +- .../extras/writer/CacheWriterAdapterTest.java | 21 +- .../extras/writer/CompositeCacheWriterTest.java | 15 +- .../jcache/openjpa/OpenJPAJCacheDataCache.java | 11 +- .../jcache/openjpa/OpenJPAJCacheDerivation.java | 4 +- .../jcache/openjpa/OpenJPAJCacheQueryCache.java | 15 +- .../commons/jcs3/jcache/OWBBeanProvider.java | 9 +- .../commons/jcs3/jcache/JCSCachingProvider.java | 7 +- .../commons/jcs3/jcache/JCSConfiguration.java | 7 +- .../commons/jcs3/jcache/TempStateCacheView.java | 20 +- .../jcache/cdi/CacheInvocationParameterImpl.java | 3 +- .../jcs3/jcache/cdi/CacheKeyGeneratorImpl.java | 3 +- .../jcs3/jcache/cdi/CacheMethodDetailsImpl.java | 5 +- .../jcs3/jcache/cdi/CacheResolverFactoryImpl.java | 3 +- .../commons/jcs3/jcache/cdi/CacheResolverImpl.java | 3 +- .../jcs3/jcache/cdi/CacheResultInterceptor.java | 1 + .../jcs3/jcache/cdi/GeneratedCacheKeyImpl.java | 3 +- .../cdi/MakeJCacheCDIInterceptorFriendly.java | 5 +- .../jmx/ConfigurableMBeanServerIdBuilder.java | 5 +- .../org/apache/commons/jcs3/jcache/jmx/JMXs.java | 3 +- .../org/apache/commons/jcs3/jcache/CacheTest.java | 53 ++-- .../commons/jcs3/jcache/CachingProviderTest.java | 10 +- .../commons/jcs3/jcache/NotSerializableTest.java | 8 +- .../jcs3/jcache/cdi/CDIJCacheHelperTest.java | 7 +- .../jcs/auxiliary/disk/file/FileDiskCache.java | 16 +- .../disk/file/FileDiskCacheAttributes.java | 21 +- .../auxiliary/disk/file/FileDiskCacheFactory.java | 33 +-- .../auxiliary/disk/file/FileDiskCacheManager.java | 8 +- .../disk/file/FileDiskCacheFactoryUnitTest.java | 12 +- .../auxiliary/disk/file/FileDiskCacheUnitTest.java | 11 +- pom.xml | 2 - 58 files changed, 419 insertions(+), 428 deletions(-)