JavaLogger javadoc and test updates

modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java

@@ -55,7 +55,7 @@
  * <h2 class="header">Java Example</h2>
  * {@link S3CheckpointSpi} can be configured as follows:
  * <pre name="code" class="java">
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * S3CheckpointSpi spi = new S3CheckpointSpi();
  *

modules/clients/src/test/resources/spring-cache.xml

@@ -183,9 +183,9 @@
             of one or more servers which will always be started first.
         -->
         <property name="discoverySpi">
-            <bean class="org.apache.ignite.spi.discovery.tcp.GridTcpDiscoverySpi">
+            <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
                 <property name="ipFinder">
-                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder">
+                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
                         <property name="addresses">
                             <list>
                                 <!--

modules/clients/src/test/resources/spring-server-node.xml

@@ -232,13 +232,13 @@
             TCP discovery SPI (uses VM-shared IP-finder).
         -->
         <property name="discoverySpi">
-            <bean class="org.apache.ignite.spi.discovery.tcp.GridTcpDiscoverySpi">
+            <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
                 <!-- Make sure both servers (unsecured and SSL-protected) can start as independent grids. -->
                 <property name="localPort" value="49500"/>
 
                 <!-- Override default IP-finder.-->
                 <property name="ipFinder">
-                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder">
+                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
                         <property name="addresses">
                             <list>
                                 <!--

modules/clients/src/test/resources/spring-server-ssl-node.xml

@@ -218,13 +218,13 @@
             TCP discovery SPI (uses VM-shared IP-finder).
         -->
         <property name="discoverySpi">
-            <bean class="org.apache.ignite.spi.discovery.tcp.GridTcpDiscoverySpi">
+            <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
                 <!-- Make sure both servers (unsecured and SSL-protected) can start as independent grids. -->
                 <property name="localPort" value="48500"/>
 
                 <!-- Override default IP-finder.-->
                 <property name="ipFinder">
-                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder">
+                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
                         <property name="addresses">
                             <list>
                                 <!--

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

@@ -30,10 +30,10 @@
  * <p>
  * Ignite logger could be configured either from code (for example log4j logger):
  * <pre name="code" class="java">
- *      GridConfiguration cfg = new GridConfiguration();
+ *      IgniteConfiguration cfg = new IgniteConfiguration();
  *      ...
  *      URL xml = U.resolveIgniteUrl("config/custom-log4j.xml");
- *      GridLogger log = new GridLog4jLogger(xml);
+ *      IgniteLogger log = new Log4JLogger(xml);
  *      ...
  *      cfg.setGridLogger(log);
  * </pre>
@@ -55,7 +55,7 @@
  * logger in your task/job code. See {@link org.apache.ignite.resources.LoggerResource} annotation about logger
  * injection.
  * <h1 class="header">Quiet Mode</h1>
- * By default Ignite 3.0 and later starts in "quiet" mode suppressing {@code INFO} and {@code DEBUG}
+ * By default Ignite starts in "quiet" mode suppressing {@code INFO} and {@code DEBUG}
  * log output. If system property {@code IGNITE_QUIET} is set to {@code false} than Ignition
  * will operate in normal un-suppressed logging mode. Note that all output in "quiet" mode is
  * done through standard output (STDOUT).

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

@@ -60,7 +60,7 @@
  * you can also automatically deploy services on startup by specifying them in {@link IgniteConfiguration}
  * like so:
  * <pre name="code" class="java">
- * GridConfiguration gridCfg = new GridConfiguration();
+ * IgniteConfiguration gridCfg = new IgniteConfiguration();
  *
  * GridServiceConfiguration svcCfg1 = new GridServiceConfiguration();
  *

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

@@ -41,7 +41,7 @@
  * {@link org.apache.ignite.configuration.IgniteConfiguration} to override some default configuration. Below is an
  * example on how to start grid with custom configuration for <strong>URI deployment</strong>.
  * <pre name="code" class="java">
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * GridUriDeployment deploySpi = new GridUriDeployment();
  *

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

@@ -397,7 +397,7 @@ public boolean isSslEnabled() {
      * Sets whether Secure Socket Layer should be enabled for REST TCP binary protocol.
      * <p/>
      * Note that if this flag is set to {@code true}, then a valid instance of {@link GridSslContextFactory}
-     * should be provided in {@code GridConfiguration}. Otherwise, TCP binary protocol will fail to start.
+     * should be provided in {@link IgniteConfiguration}. Otherwise, TCP binary protocol will fail to start.
      *
      * @param sslEnabled {@code True} if SSL should be enabled.
      */

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

@@ -1309,7 +1309,7 @@ public void setCommunicationSpi(CommunicationSpi commSpi) {
      * on arrive to mapped node. This approach suits well for large amount of small
      * jobs (which is a wide-spread use case). User still can control the number
      * of concurrent jobs by setting maximum thread pool size defined by
-     * GridConfiguration.getPublicThreadPoolSize() configuration property.
+     * IgniteConfiguration.getPublicThreadPoolSize() configuration property.
      *
      * @return Grid collision SPI implementation or {@code null} to use default implementation.
      */

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

@@ -1689,7 +1689,7 @@ public void initializeDefaultCacheConfiguration(IgniteConfiguration cfg) throws
                 if (!U.discoOrdered(cfg.getDiscoverySpi()) && !U.relaxDiscoveryOrdered())
                     throw new IgniteCheckedException("Discovery SPI implementation does not support node ordering and " +
                         "cannot be used with cache (use SPI with @GridDiscoverySpiOrderSupport annotation, " +
-                        "like GridTcpDiscoverySpi)");
+                        "like TcpDiscoverySpi)");
 
                 for (CacheConfiguration ccfg : cacheCfgs) {
                     if (CU.isHadoopSystemCache(ccfg.getName()))

modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java

@@ -600,7 +600,7 @@ private void processP2PMessage(
         }
         catch (RejectedExecutionException e) {
             U.error(log, "Failed to process P2P message due to execution rejection. Increase the upper bound " +
-                "on 'ExecutorService' provided by 'GridConfiguration.getPeerClassLoadingThreadPoolSize()'. " +
+                "on 'ExecutorService' provided by 'IgniteConfiguration.getPeerClassLoadingThreadPoolSize()'. " +
                 "Will attempt to process message in the listener thread instead.", e);
 
             c.run();
@@ -639,7 +639,7 @@ private void processRegularMessage(
         }
         catch (RejectedExecutionException e) {
             U.error(log, "Failed to process regular message due to execution rejection. Increase the upper bound " +
-                "on 'ExecutorService' provided by 'GridConfiguration.getPublicThreadPoolSize()'. " +
+                "on 'ExecutorService' provided by 'IgniteConfiguration.getPublicThreadPoolSize()'. " +
                 "Will attempt to process message in the listener thread instead.", e);
 
             c.run();
@@ -1342,7 +1342,7 @@ public void addMessageListener(Object topic, final GridMessageListener lsnr) {
             }
             catch (RejectedExecutionException e) {
                 U.error(log, "Failed to process delayed message due to execution rejection. Increase the upper bound " +
-                    "on executor service provided in 'GridConfiguration.getPublicThreadPoolSize()'). Will attempt to " +
+                    "on executor service provided in 'IgniteConfiguration.getPublicThreadPoolSize()'). Will attempt to " +
                     "process message in the listener thread instead.", e);
 
                 for (GridCommunicationMessageSet msgSet : msgSets)

modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentManager.java

@@ -462,7 +462,7 @@ else if (locDep != null) {
                 if (locDep != null) {
                     if (!isPerVersionMode(locDep.deployMode())) {
                         U.warn(log, "Failed to deploy class in SHARED or CONTINUOUS mode (class is locally deployed " +
-                            "in some other mode). Either change GridConfiguration.getDeploymentMode() property to " +
+                            "in some other mode). Either change IgniteConfiguration.getDeploymentMode() property to " +
                             "SHARED or CONTINUOUS or remove class from local classpath and any of " +
                             "the local GAR deployments that may have it [cls=" + meta.className() + ", depMode=" +
                             locDep.deployMode() + ']', "Failed to deploy class in SHARED or CONTINUOUS mode.");

modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java

@@ -293,7 +293,7 @@ else if (log.isDebugEnabled())
                             // Warn only if mode is not CONTINUOUS.
                             if (meta.deploymentMode() != CONTINUOUS)
                                 LT.warn(log, null, "Local node is in participants (most probably, " +
-                                    "GridConfiguration.getPeerClassLoadingLocalClassPathExclude() is not used properly " +
+                                    "IgniteConfiguration.getPeerClassLoadingLocalClassPathExclude() is not used properly " +
                                     "[locNodeId=" + ctx.localNodeId() + ", meta=" + meta + ']');
 
                             continue;

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

@@ -392,7 +392,7 @@ public ClusterNode node(UUID nodeId) {
      * Gets grid logger for given class.
      *
      * @param cls Class to get logger for.
-     * @return GridLogger instance.
+     * @return IgniteLogger instance.
      */
     public IgniteLogger logger(Class<?> cls) {
         return kernalCtx.log(cls);

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java

@@ -100,7 +100,7 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> {
 
                 boolean set = topVer.setIfGreater(e.topologyVersion());
 
-                assert set : "Have you configured GridTcpDiscoverySpi for your in-memory data grid? [newVer=" +
+                assert set : "Have you configured TcpDiscoverySpi for your in-memory data grid? [newVer=" +
                     e.topologyVersion() + ", curVer=" + topVer.get() + ']';
 
                 if (e.type() == EVT_NODE_LEFT || e.type() == EVT_NODE_FAILED) {

modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java

@@ -40,7 +40,7 @@
  *      <li>GridManagerRegistry
  *      <li>GridProcessor
  *      <li>GridProcessorRegistry
- *      <li>GridLogger
+ *      <li>IgniteLogger
  *      <li>GridDiscoveryMetricsProvider
  *      <li>GridByteArrayList
  *      </ul>

modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java

@@ -40,7 +40,7 @@
  * <pre name="code" class="xml">
  *      ...
  *      &lt;property name="gridLogger"&gt;
- *          &lt;bean class="org.apache.ignite.logger.java.IgniteJavaLogger"&gt;
+ *          &lt;bean class="org.apache.ignite.logger.java.JavaLogger"&gt;
  *              &lt;constructor-arg type="java.util.logging.Logger"&gt;
  *                  &lt;bean class="java.util.logging.Logger"&gt;
  *                      &lt;constructor-arg type="java.lang.String" value="global"/&gt;
@@ -54,23 +54,23 @@
  * <pre name="code" class="xml">
  *      ...
  *      &lt;property name="gridLogger"&gt;
- *          &lt;bean class="org.apache.ignite.logger.java.IgniteJavaLogger"/&gt;
+ *          &lt;bean class="org.apache.ignite.logger.java.JavaLogger"/&gt;
  *      &lt;/property&gt;
  *      ...
  * </pre>
  * And the same configuration if you'd like to configure Ignite in your code:
  * <pre name="code" class="java">
- *      GridConfiguration cfg = new GridConfiguration();
+ *      IgniteConfiguration cfg = new IgniteConfiguration();
  *      ...
- *      GridLogger log = new GridJavaLogger(Logger.global);
+ *      IgniteLogger log = new JavaLogger(Logger.global);
  *      ...
  *      cfg.setGridLogger(log);
  * </pre>
  * or which is actually the same:
  * <pre name="code" class="java">
- *      GridConfiguration cfg = new GridConfiguration();
+ *      IgniteConfiguration cfg = new IgniteConfiguration();
  *      ...
- *      GridLogger log = new GridJavaLogger();
+ *      IgniteLogger log = new JavaLogger();
  *      ...
  *      cfg.setGridLogger(log);
  * </pre>

modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java

@@ -23,11 +23,11 @@
 import java.io.*;
 
 /**
- * {@code GridMarshaller} allows to marshal or unmarshal objects in grid. It provides
+ * {@code Marshaller} allows to marshal or unmarshal objects in grid. It provides
  * serialization/deserialization mechanism for all instances that are sent across networks
  * or are otherwise serialized.
  * <p>
- * Ignite provides the following {@code GridMarshaller} implementations:
+ * Ignite provides the following {@code Marshaller} implementations:
  * <ul>
  * <li>{@link org.apache.ignite.marshaller.optimized.OptimizedMarshaller} - default</li>
  * <li>{@link org.apache.ignite.marshaller.jdk.JdkMarshaller}</li>
@@ -36,11 +36,11 @@
  * Below are examples of marshaller configuration, usage, and injection into tasks, jobs,
  * and SPI's.
  * <h2 class="header">Java Example</h2>
- * {@code GridMarshaller} can be explicitely configured in code.
+ * {@code Marshaller} can be explicitly configured in code.
  * <pre name="code" class="java">
- * GridJdkMarshaller marshaller = new GridJdkMarshaller();
+ * JdkMarshaller marshaller = new JdkMarshaller();
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override marshaller.
  * cfg.setMarshaller(marshaller);
@@ -49,12 +49,12 @@
  * G.start(cfg);
  * </pre>
  * <h2 class="header">Spring Example</h2>
- * GridMarshaller can be configured from Spring XML configuration file:
+ * Marshaller can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
  * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"&gt;
  *     ...
  *     &lt;property name="marshaller"&gt;
- *         &lt;bean class="org.apache.ignite.marshaller.jdk.GridJdkMarshaller"/&gt;
+ *         &lt;bean class="org.apache.ignite.marshaller.jdk.JdkMarshaller"/&gt;
  *     &lt;/property&gt;
  *     ...
  * &lt;/bean&gt;

modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java

@@ -31,11 +31,11 @@
  * <h2 class="header">Mandatory</h2>
  * This marshaller has no mandatory configuration parameters.
  * <h2 class="header">Java Example</h2>
- * {@code GridJdkMarshaller} needs to be explicitly configured to override default {@link org.apache.ignite.marshaller.optimized.OptimizedMarshaller}.
+ * {@code JdkMarshaller} needs to be explicitly configured to override default {@link org.apache.ignite.marshaller.optimized.OptimizedMarshaller}.
  * <pre name="code" class="java">
- * GridJdkMarshaller marshaller = new GridJdkMarshaller();
+ * JdkMarshaller marshaller = new JdkMarshaller();
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override default marshaller.
  * cfg.setMarshaller(marshaller);
@@ -44,12 +44,12 @@
  * G.start(cfg);
  * </pre>
  * <h2 class="header">Spring Example</h2>
- * GridJdkMarshaller can be configured from Spring XML configuration file:
+ * JdkMarshaller can be configured from Spring XML configuration file:
  * <pre name="code" class="xml">
  * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"&gt;
  *     ...
  *     &lt;property name="marshaller"&gt;
- *         &lt;bean class="org.apache.ignite.marshaller.jdk.GridJdkMarshaller"/&gt;
+ *         &lt;bean class="org.apache.ignite.marshaller.jdk.JdkMarshaller"/&gt;
  *     &lt;/property&gt;
  *     ...
  * &lt;/bean&gt;

modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java

@@ -35,7 +35,7 @@
  * about 20 times faster as it removes lots of serialization overhead that exists in
  * default JDK implementation.
  * <p>
- * {@code GridOptimizedMarshaller} is tested only on Java HotSpot VM on other VMs
+ * {@code OptimizedMarshaller} is tested only on Java HotSpot VM on other VMs
  * it could yield unexpected results. It is the default marshaller on Java HotSpot VMs
  * and will be used if no other marshaller was explicitly configured.
  * <p>
@@ -44,12 +44,12 @@
  * This marshaller has no mandatory configuration parameters.
  * <h2 class="header">Java Example</h2>
  * <pre name="code" class="java">
- * GridOptimizedMarshaller marshaller = new GridOptimizedMarshaller();
+ * OptimizedMarshaller marshaller = new OptimizedMarshaller();
  *
  * // Enforce Serializable interface.
  * marshaller.setRequireSerializable(true);
  *
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * // Override marshaller.
  * cfg.setMarshaller(marshaller);
@@ -63,7 +63,7 @@
  * &lt;bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"&gt;
  *     ...
  *     &lt;property name="marshaller"&gt;
- *         &lt;bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller"&gt;
+ *         &lt;bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller"&gt;
  *             &lt;property name="requireSerializable"&gt;true&lt;/property&gt;
  *         &lt;/bean&gt;
  *     &lt;/property&gt;

modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java

@@ -36,7 +36,7 @@
  * public class MyGridJob implements ComputeJob {
  *      ...
  *      @LoggerResource
- *      private GridLogger log;
+ *      private IgniteLogger log;
  *      ...
  *  }
  * </pre>

modules/core/src/main/java/org/apache/ignite/resources/SpringResource.java

@@ -77,7 +77,7 @@
  *     ...
  *     // Inject logger (or any other resource).
  *     @LoggerResource
- *     private GridLogger log;
+ *     private IgniteLogger log;
  *
  *     // Inject ignite instance (or any other resource).
  *     @IgniteInstanceResource

modules/core/src/main/java/org/apache/ignite/services/Service.java

@@ -62,7 +62,7 @@
  * </pre>
  * Or from grid configuration on startup:
  * <pre name="code" class="java">
- * GridConfiguration gridCfg = new GridConfiguration();
+ * IgniteConfiguration gridCfg = new IgniteConfiguration();
  *
  * GridServiceConfiguration svcCfg = new GridServiceConfiguration();
  *

modules/core/src/main/java/org/apache/ignite/services/ServiceConfiguration.java

@@ -30,7 +30,7 @@
  * can also be automatically deployed on startup by specifying them in {@link org.apache.ignite.configuration.IgniteConfiguration}
  * like so:
  * <pre name="code" class="java">
- * GridConfiguration gridCfg = new GridConfiguration();
+ * IgniteConfiguration gridCfg = new IgniteConfiguration();
  *
  * GridServiceConfiguration svcCfg1 = new GridServiceConfiguration();
  *

modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java

@@ -44,7 +44,7 @@
  * <h2 class="header">Java Example</h2>
  * {@link CacheCheckpointSpi} can be configured as follows:
  * <pre name="code" class="java">
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * String cacheName = "checkpoints";
  *

modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java

@@ -62,7 +62,7 @@
  * <h2 class="header">Java Example</h2>
  * {@link JdbcCheckpointSpi} can be configured as follows:
  * <pre name="code" class="java">
- * GridConfiguration cfg = new GridConfiguration();
+ * IgniteConfiguration cfg = new IgniteConfiguration();
  *
  * GridJdbcCheckpointSpi checkpointSpi = new GridJdbcCheckpointSpi();
  *