clear code

Author: junphine

modules/clients/pom.xml

@@ -87,13 +87,13 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>ignite-log4j2</artifactId>
+            <artifactId>ignite-json</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>ignite-rest-http</artifactId>
+            <artifactId>ignite-log4j2</artifactId>
             <scope>test</scope>
         </dependency>
 

modules/control-utility/src/test/java/org/apache/ignite/testsuites/IgniteControlUtilityTestSuite.java

@@ -36,8 +36,7 @@
 import org.apache.ignite.util.GridCommandHandlerMetadataTest;
 import org.apache.ignite.util.GridCommandHandlerSslTest;
 import org.apache.ignite.util.GridCommandHandlerTest;
-import org.apache.ignite.util.GridCommandHandlerWithSslFactoryTest;
-import org.apache.ignite.util.GridCommandHandlerWithSSLTest;
+
 import org.apache.ignite.util.KillCommandsControlShTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
@@ -50,8 +49,7 @@
     CommandHandlerParsingTest.class,
 
     GridCommandHandlerTest.class,
-    GridCommandHandlerWithSSLTest.class,
-    GridCommandHandlerWithSslFactoryTest.class,
+
     GridCommandHandlerIncompatibleSslConfigTest.class,
     GridCommandHandlerClusterByClassTest.class,
     GridCommandHandlerClusterByClassWithSSLTest.class,

modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerWithSslFactoryTest.java

@@ -21,7 +21,6 @@
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 
-import static org.apache.ignite.igfs.IgfsIpcEndpointType.SHMEM;
 import static org.apache.ignite.igfs.IgfsIpcEndpointType.TCP;
 
 /**

modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java

@@ -162,6 +162,7 @@
 import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SERVICE_POOL;
 import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
 import static org.apache.ignite.internal.managers.communication.GridIoPolicy.UTILITY_CACHE_POOL;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.IGFS_POOL;
 import static org.apache.ignite.internal.managers.communication.GridIoPolicy.isReservedGridIoPolicy;
 import static org.apache.ignite.internal.processors.metric.impl.MetricUtils.metricName;
 import static org.apache.ignite.internal.processors.tracing.MTC.support;
@@ -1303,7 +1304,7 @@ private void onMessage0(UUID nodeId, GridIoMessage msg, IgniteRunnable msgC) {
                 case AFFINITY_POOL:
                 case UTILITY_CACHE_POOL:
                 case IDX_POOL:
-                case GridIoPolicy.IGFS_POOL: //add@byron
+                case IGFS_POOL: //add@byron
                 case DATA_STREAMER_POOL:
                 case QUERY_POOL:
                 case SCHEMA_POOL:

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

@@ -780,8 +780,8 @@ public Executor poolForPolicy(byte plc) throws IgniteCheckedException {
                 assert getServiceExecutorService() != null : "Service pool is not configured.";
 
                 return getServiceExecutorService();
-                
-            case GridIoPolicy.IGFS_POOL: // add@byronIGFS_POOL
+
+            case GridIoPolicy.IGFS_POOL: // add@byron IGFS_POOL
             case GridIoPolicy.DATA_STREAMER_POOL:
                 assert getDataStreamerExecutorService() != null : "Data streamer pool is not configured.";
 

modules/core/src/main/java/org/apache/ignite/internal/processors/pool/PoolProcessor.java

@@ -2013,7 +2013,7 @@ public IgfsCreateResult appendDual(final IgfsSecondaryFileSystem fs, final IgfsP
 
                                     try (IgfsSecondaryFileSystemPositionedReadable reader = fs.open(path, bufSize)) {
                                         IgniteInternalFuture<byte[]> fut =
-                                            igfsCtx.data().dataBlock(info, path, blockIdx, reader);
+                                                igfsCtx.data().dataBlock(info, path, blockIdx, reader);
 
                                         assert fut != null;
 

modules/igfs/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java

@@ -106,7 +106,6 @@ public IgfsProcessor(GridKernalContext ctx) {
                 for (CacheConfiguration cacheCfg : cacheCfgs) {
                     if (Objects.equals(cacheCfg.getName(), metaCacheName)) {
                         metaClient = false;
-
                         break;
                     }
                 }

modules/igfs/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java

@@ -129,12 +129,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ignite-rest-http</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>