Sonar issues fixes

Signed-off-by: Pavel Jareš <[email protected]>
zowe · Sep 22, 2023 · 5de0040 · 5de0040
1 parent 62d4f9d
commit 5de0040
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/common-service-core/src/main/java/org/zowe/apiml/util/CacheUtils.java b/common-service-core/src/main/java/org/zowe/apiml/util/CacheUtils.java
@@ -67,7 +67,7 @@ public void evictSubset(CacheManager cacheManager, String cacheName, Predicate<C
             Spliterator<javax.cache.Cache.Entry<Object, Object>> spliterator = ((javax.cache.Cache<Object, Object>) nativeCache).spliterator();
             Set<Object> keysToRemove = StreamSupport.stream(spliterator, true)
                 .filter(e -> !(e.getKey() instanceof  CompositeKey) || keyPredicate.test((CompositeKey) e.getKey()))
-                .map(e -> e.getKey())
+                .map(javax.cache.Cache.Entry::getKey)
                 .collect(Collectors.toSet());
             ((javax.cache.Cache<Object, Object>) nativeCache).removeAll(keysToRemove);
         } else {
@@ -92,7 +92,7 @@ public <T> List<T> getAllRecords(CacheManager cacheManager, String cacheName) {
         final Object nativeCache = cache.getNativeCache();
         if (nativeCache instanceof javax.cache.Cache) {
             Spliterator<javax.cache.Cache.Entry<Object, T>> spliterator = ((javax.cache.Cache<Object, T>) nativeCache).spliterator();
-            return StreamSupport.stream(spliterator, true).map(e -> e.getValue()).collect(Collectors.toList());
+            return StreamSupport.stream(spliterator, true).map(javax.cache.Cache.Entry::getValue).collect(Collectors.toList());
         } else {
             throw new IllegalArgumentException("Unsupported type of cache : " + nativeCache.getClass());
         }

diff --git a/gateway-service/src/main/java/org/zowe/apiml/gateway/config/CacheConfig.java b/gateway-service/src/main/java/org/zowe/apiml/gateway/config/CacheConfig.java
@@ -23,6 +23,7 @@
 import org.zowe.apiml.util.CacheUtils;
 
 import javax.annotation.PostConstruct;
+import java.io.IOException;
 
 /**
  * Spring configuration to use EhCache. This context is using from application and also from tests.
@@ -48,14 +49,14 @@ public void afterPropertiesSet() {
     }
 
     @Bean
-    public JCacheManagerFactoryBean cacheManagerFactoryBean() throws Exception {
+    public JCacheManagerFactoryBean cacheManagerFactoryBean() throws IOException {
         JCacheManagerFactoryBean jCacheManagerFactoryBean = new JCacheManagerFactoryBean();
         jCacheManagerFactoryBean.setCacheManagerUri(new ClassPathResource("ehcache.xml").getURI());
         return jCacheManagerFactoryBean;
     }
 
     @Bean
-    public CacheManager cacheManager() throws Exception {
+    public CacheManager cacheManager() throws IOException {
         final JCacheCacheManager jCacheCacheManager = new JCacheCacheManager();
         jCacheCacheManager.setCacheManager(cacheManagerFactoryBean().getObject());
         return jCacheCacheManager;