IGNITE-27832 Remove MemoryConfiguration, PersistentStoreConfiguration

Author: nizhikov

modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java

@@ -25,10 +25,9 @@
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.compatibility.testframework.junits.SkipTestIfIsJdkNewer;
+import org.apache.ignite.configuration.DataRegionConfiguration;
+import org.apache.ignite.configuration.DataStorageConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.configuration.MemoryConfiguration;
-import org.apache.ignite.configuration.MemoryPolicyConfiguration;
-import org.apache.ignite.configuration.PersistentStoreConfiguration;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.processors.cache.GridCacheAbstractFullApiSelfTest;
 import org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree;
@@ -174,16 +173,10 @@ private static class ConfigurationClosure implements IgniteInClosure<IgniteConfi
      * @param cfg ignite config to setup.
      */
     private static void configPersistence(IgniteConfiguration cfg) {
-        final PersistentStoreConfiguration psCfg = new PersistentStoreConfiguration();
-
-        cfg.setPersistentStoreConfiguration(psCfg);
-
-        final MemoryConfiguration memCfg = new MemoryConfiguration();
-        final MemoryPolicyConfiguration memPolCfg = new MemoryPolicyConfiguration();
-
-        memPolCfg.setMaxSize(32L * 1024 * 1024); // we don't need much memory for this test
-        memCfg.setMemoryPolicies(memPolCfg);
-        cfg.setMemoryConfiguration(memCfg);
+        cfg.setDataStorageConfiguration(new DataStorageConfiguration().setDataRegionConfigurations(new DataRegionConfiguration()
+            // we don't need much memory for this test
+            .setMaxSize(32L * 1024 * 1024)
+            .setPersistenceEnabled(true)));
     }
 
     /**

modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java

@@ -35,7 +35,6 @@
 import org.apache.ignite.configuration.DataRegionConfiguration;
 import org.apache.ignite.configuration.DataStorageConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.configuration.PersistentStoreConfiguration;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.processors.cache.GridCacheAbstractFullApiSelfTest;
 import org.apache.ignite.internal.util.typedef.internal.U;
@@ -248,7 +247,9 @@ public ConfigurationClosure(boolean compactFooter) {
 
             cfg.setPeerClassLoadingEnabled(false);
 
-            cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration());
+            cfg.setDataStorageConfiguration(new DataStorageConfiguration()
+                .setDefaultDataRegionConfiguration(new DataRegionConfiguration()
+                    .setPersistenceEnabled(true)));
 
             cfg.setBinaryConfiguration(new BinaryConfiguration().setCompactFooter(compactFooter));
         }

modules/core/src/main/java/org/apache/ignite/MemoryMetrics.java

@@ -17,15 +17,15 @@
 
 package org.apache.ignite;
 
-import org.apache.ignite.configuration.MemoryConfiguration;
-import org.apache.ignite.configuration.MemoryPolicyConfiguration;
+import org.apache.ignite.configuration.DataRegionConfiguration;
+import org.apache.ignite.configuration.DataStorageConfiguration;
 import org.apache.ignite.spi.metric.ReadOnlyMetricRegistry;
 
 /**
  * This interface provides page memory related metrics of a specific Apache Ignite node. The overall page memory
- * architecture is covered in {@link MemoryConfiguration}.
+ * architecture is covered in {@link DataStorageConfiguration}.
  * <p>
- * Since there are can be several memory regions configured with {@link MemoryPolicyConfiguration} on an individual
+ * Since there are can be several data regions configured with {@link DataRegionConfiguration} on an individual
  * Apache Ignite node, the metrics for every region will be collected and obtained separately.
  * <p>
  * There are two ways to get the metrics of an Apache Ignite node.
@@ -43,7 +43,7 @@
  * <p>
  * Memory metrics collection is not a free operation and might affect performance of an application. This is the reason
  * why the metrics are turned off by default. To enable the collection you can use both
- * {@link MemoryPolicyConfiguration#setMetricsEnabled(boolean)} configuration property.
+ * {@link DataStorageConfiguration#setMetricsEnabled(boolean)} configuration property.
  *
  * @deprecated Check the {@link ReadOnlyMetricRegistry} with "name=io.dataregion.{data_region_name}" instead.
  */

modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java

@@ -535,14 +535,6 @@ public class IgniteConfiguration {
     /** Custom executor configurations. */
     private ExecutorConfiguration[] execCfgs;
 
-    /** Page memory configuration. */
-    @Deprecated
-    private MemoryConfiguration memCfg;
-
-    /** Persistence store configuration. */
-    @Deprecated
-    private PersistentStoreConfiguration pstCfg;
-
     /** Page memory configuration. */
     private DataStorageConfiguration dsCfg;
 
@@ -651,8 +643,6 @@ public IgniteConfiguration(IgniteConfiguration cfg) {
         binaryCfg = cfg.getBinaryConfiguration();
         clusterStateOnStart = cfg.getClusterStateOnStart();
         dsCfg = cfg.getDataStorageConfiguration();
-        memCfg = cfg.getMemoryConfiguration();
-        pstCfg = cfg.getPersistentStoreConfiguration();
         cacheCfg = cfg.getCacheConfiguration();
         cacheKeyCfg = cfg.getCacheKeyConfiguration();
         cacheSanityCheckEnabled = cfg.isCacheSanityCheckEnabled();
@@ -2634,68 +2624,6 @@ public IgniteConfiguration setDataStorageConfiguration(DataStorageConfiguration
         return this;
     }
 
-    /**
-     * Gets page memory configuration.
-     *
-     * @return Memory configuration.
-     * @deprecated Use {@link DataStorageConfiguration} instead.
-     */
-    @Deprecated
-    public MemoryConfiguration getMemoryConfiguration() {
-        return memCfg;
-    }
-
-    /**
-     * Sets page memory configuration.
-     *
-     * @param memCfg Memory configuration.
-     * @return {@code this} for chaining.
-     * @deprecated Use {@link DataStorageConfiguration} instead.
-     */
-    @Deprecated
-    public IgniteConfiguration setMemoryConfiguration(MemoryConfiguration memCfg) {
-        this.memCfg = memCfg;
-
-        return this;
-    }
-
-    /**
-     * Gets persistence configuration used by Apache Ignite Persistent Store.
-     *
-     * @return Persistence configuration.
-     *
-     * @deprecated Part of old API. Use {@link DataStorageConfiguration} for configuring persistence instead.
-     */
-    @Deprecated
-    public PersistentStoreConfiguration getPersistentStoreConfiguration() {
-        return pstCfg;
-    }
-
-    /**
-     * @return Flag {@code true} if persistence is enabled, {@code false} if disabled.
-     *
-     * @deprecated Part of legacy configuration API. Doesn't work if new configuration API is used.
-     */
-    @Deprecated
-    public boolean isPersistentStoreEnabled() {
-        return pstCfg != null;
-    }
-
-    /**
-     * Sets persistence configuration activating Apache Ignite Persistent Store.
-     *
-     * @param pstCfg Persistence configuration.
-     * @return {@code this} for chaining.
-     *
-     * @deprecated Part of old API. Use {@link DataStorageConfiguration} for configuring persistence instead.
-     */
-    @Deprecated
-    public IgniteConfiguration setPersistentStoreConfiguration(PersistentStoreConfiguration pstCfg) {
-        this.pstCfg = pstCfg;
-
-        return this;
-    }
-
     /**
      * Gets flag indicating whether the cluster will be active on start. If cluster is not active on start,
      * there will be no cache partition map exchanges performed until the cluster is activated. This should