# IGNITE-45 Get rid GridCacheProcessor#publicProxies.

modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java

@@ -222,8 +222,8 @@ public CacheManager(URI uri, CachingProvider cachingProvider, ClassLoader clsLdr
 
             Collection<String> res = new ArrayList<>();
 
-            for (GridCache<?, ?> cache : ignite.context().cache().publicCaches())
-                res.add(cache.name());
+            for (IgniteCache<?, ?> cache : ignite.context().cache().publicCaches())
+                res.add(cache.getName());
 
             return Collections.unmodifiableCollection(res);
         }

modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java

@@ -2315,7 +2315,7 @@ public <K, V> GridCache<K, V> cache(@Nullable String name) {
     /**
      * @return Public caches.
      */
-    public Collection<GridCache<?, ?>> caches() {
+    public Collection<IgniteCacheProxy<?, ?>> caches() {
         guard();
 
         try {

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java

@@ -90,9 +90,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
     /** Map of proxies. */
     private final Map<String, IgniteCacheProxy<?, ?>> jCacheProxies;
 
-    /** Map of public proxies, i.e. proxies which could be returned to the user. */
-    private volatile List<GridCache<?, ?>> publicProxies;
-
     /** Map of preload finish futures grouped by preload order. */
     private final NavigableMap<Integer, IgniteInternalFuture<?>> preloadFuts;
 
@@ -689,8 +686,6 @@ private void cleanup(CacheConfiguration cfg, @Nullable Object rsrc, boolean near
                 startCache(cache);
 
                 jCacheProxies.put(maskNull(name), new IgniteCacheProxy(ctx, cache, null, false));
-
-                publicProxies = null;
             }
         }
 
@@ -1349,11 +1344,8 @@ public void blockGateway(DynamicCacheChangeRequest req) {
         // Break the proxy before exchange future is done.
         IgniteCacheProxy<?, ?> proxy = jCacheProxies.remove(maskNull(req.cacheName()));
 
-        if (proxy != null) {
-            publicProxies = null;
-
+        if (proxy != null)
             proxy.gate().onStopped();
-        }
     }
 
     /**
@@ -1394,8 +1386,6 @@ public void onExchangeDone(AffinityTopologyVersion topVer, Collection<DynamicCac
                 String masked = maskNull(cacheCtx.name());
 
                 jCacheProxies.put(masked, new IgniteCacheProxy(cache.context(), cache, null, false));
-
-                publicProxies = null;
             }
         }
 
@@ -2224,18 +2214,12 @@ public <K, V> IgniteCacheProxy<K, V> jcache(@Nullable String name) {
     /**
      * @return All configured public cache instances.
      */
-    public Collection<GridCache<?, ?>> publicCaches() {
-        List<GridCache<?, ?>> res = publicProxies;
-
-        if (res == null) {
-            res = new ArrayList<>(jCacheProxies.size());
-
-            for (IgniteCacheProxy<?, ?> proxy : jCacheProxies.values()) {
-                if (!sysCaches.contains(proxy.getName()))
-                    res.add(proxy.legacyProxy());
-            }
+    public Collection<IgniteCacheProxy<?, ?>> publicCaches() {
+        List<IgniteCacheProxy<?, ?>> res = new ArrayList<>(jCacheProxies.size());
 
-            publicProxies = res;
+        for (Map.Entry<String, IgniteCacheProxy<?, ?>> entry : jCacheProxies.entrySet()) {
+            if (!sysCaches.contains(entry.getKey()))
+                res.add(entry.getValue());
         }
 
         return res;

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java

@@ -116,16 +116,16 @@ private void assertSetResourcesCleared() {
         for (int i = 0; i < gridCount(); i++) {
             IgniteKernal grid = (IgniteKernal)grid(i);
 
-            for (GridCache cache : grid.caches()) {
-                CacheDataStructuresManager dsMgr = grid.internalCache(cache.name()).context().dataStructures();
+            for (IgniteCache cache : grid.caches()) {
+                CacheDataStructuresManager dsMgr = grid.internalCache(cache.getName()).context().dataStructures();
 
                 Map map = GridTestUtils.getFieldValue(dsMgr, "setsMap");
 
                 assertEquals("Set not removed [grid=" + i + ", map=" + map + ']', 0, map.size());
 
                 map = GridTestUtils.getFieldValue(dsMgr, "setDataMap");
 
-                assertEquals("Set data not removed [grid=" + i + ", cache=" + cache.name() + ", map=" + map + ']',
+                assertEquals("Set data not removed [grid=" + i + ", cache=" + cache.getName() + ", map=" + map + ']',
                     0,
                     map.size());
             }
@@ -139,8 +139,8 @@ private void assertSetIteratorsCleared() {
         for (int i = 0; i < gridCount(); i++) {
             IgniteKernal grid = (IgniteKernal) grid(i);
 
-            for (GridCache cache : grid.caches()) {
-                GridCacheQueryManager queries = grid.internalCache(cache.name()).context().queries();
+            for (IgniteCache cache : grid.caches()) {
+                GridCacheQueryManager queries = grid.internalCache(cache.getName()).context().queries();
 
                 Map map = GridTestUtils.getFieldValue(queries, GridCacheQueryManager.class, "qryIters");
 

modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java

@@ -110,7 +110,7 @@ public void testCache() throws Exception {
 
         assert ((IgniteKernal)g).caches().size() == 1;
 
-        assert CACHE_NAME.equals(((IgniteKernal)g).caches().iterator().next().name());
+        assert CACHE_NAME.equals(((IgniteKernal)g).caches().iterator().next().getName());
 
         GridTestUtils.assertThrows(log(), new Callable<Object>() {
             @Override public Object call() throws Exception {

modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java

@@ -18,9 +18,9 @@
 package org.apache.ignite.cache.hibernate;
 
 import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.testframework.junits.common.*;
@@ -79,8 +79,8 @@ public class HibernateL2CacheConfigurationSelfTest extends GridCommonAbstractTes
 
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
-        for (GridCache<?, ?> cache : ((IgniteKernal)grid(0)).caches())
-            cache.clear();
+        for (IgniteCacheProxy<?, ?> cache : ((IgniteKernal)grid(0)).caches())
+            cache.legacyProxy().clear();
     }
 
     /** {@inheritDoc} */

modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java

@@ -17,10 +17,10 @@
 
 package org.apache.ignite.cache.hibernate;
 
-import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.affinity.rendezvous.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -1917,7 +1917,7 @@ private void cleanup() throws Exception {
 
         sesFactory2 = null;
 
-        for (GridCache<?, ?> cache : ((IgniteKernal)grid(0)).caches())
-            cache.clear();
+        for (IgniteCacheProxy<?, ?> cache : ((IgniteKernal)grid(0)).caches())
+            cache.legacyProxy().clear();
     }
 }

modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java

@@ -233,9 +233,9 @@ else if (cfg != null)
     @Override public Collection<String> getCacheNames() {
         assert grid != null;
 
-        return F.viewReadOnly(((IgniteKernal)grid).caches(), new IgniteClosure<GridCache<?,?>, String>() {
-            @Override public String apply(GridCache<?, ?> c) {
-                return c.name();
+        return F.viewReadOnly(((IgniteKernal)grid).caches(), new IgniteClosure<IgniteCache<?,?>, String>() {
+            @Override public String apply(IgniteCache<?, ?> c) {
+                return c.getName();
             }
         });
     }