IGNITE-14823 Service abbrevation (#11195)
diff --git a/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServiceMiddlewareExample.java b/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServiceMiddlewareExample.java
index 8139c64..d42a026 100644
--- a/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServiceMiddlewareExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServiceMiddlewareExample.java
@@ -124,18 +124,18 @@
/** {@inheritDoc} */
@Override public Object invoke(String mtd, Object[] args, ServiceContext ctx, Callable<Object> next) throws Exception {
- String serviceName = ctx.name();
+ String srvcName = ctx.name();
ServiceCallContext callCtx = ctx.currentCallContext();
String user = callCtx == null ? null : callCtx.attribute("user");
- recordEvent(user, serviceName, mtd, "start");
+ recordEvent(user, srvcName, mtd, "start");
try {
// Execute service method.
Object res = next.call();
// Record finish event after execution of the service method.
- recordEvent(user, serviceName, mtd, "result " + res);
+ recordEvent(user, srvcName, mtd, "result " + res);
return res;
}
@@ -143,7 +143,7 @@
log.error("Intercepted error", e);
// Record error.
- recordEvent(user, serviceName, mtd, "error: " + e.getMessage());
+ recordEvent(user, srvcName, mtd, "error: " + e.getMessage());
// Re-throw exception to initiator.
throw e;
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
index 196d128..c1f4f90 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
@@ -685,17 +685,17 @@
/** */
private void onStart(GridKernalContext ctx, Service... services) {
- for (Service service : services) {
- if (service instanceof LifecycleAware)
- ((LifecycleAware)service).onStart(ctx);
+ for (Service srvc : services) {
+ if (srvc instanceof LifecycleAware)
+ ((LifecycleAware)srvc).onStart(ctx);
}
}
/** */
private void onStop(Service... services) {
- for (Service service : services) {
- if (service instanceof LifecycleAware)
- ((LifecycleAware)service).onStop();
+ for (Service srvc : services) {
+ if (srvc instanceof LifecycleAware)
+ ((LifecycleAware)srvc).onStop();
}
}
diff --git a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/KillCommandDdlIntegrationTest.java b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/KillCommandDdlIntegrationTest.java
index 7c4ecde..56c76c5 100644
--- a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/KillCommandDdlIntegrationTest.java
+++ b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/KillCommandDdlIntegrationTest.java
@@ -183,20 +183,20 @@
/** @throws Exception If failed. */
@Test
public void testCancelService() throws Exception {
- String serviceName = "MY_SERVICE";
+ String srvcName = "MY_SERVICE";
ServiceConfiguration scfg = new ServiceConfiguration();
- scfg.setName(serviceName);
+ scfg.setName(srvcName);
scfg.setMaxPerNodeCount(1);
scfg.setNodeFilter(grid(0).cluster().predicate());
scfg.setService(new TestServiceImpl());
client.services().deploy(scfg);
- TestService svc = client.services().serviceProxy(serviceName, TestService.class, true);
+ TestService svc = client.services().serviceProxy(srvcName, TestService.class, true);
assertNotNull(svc);
- sql(client, "KILL SERVICE '" + serviceName + "'");
+ sql(client, "KILL SERVICE '" + srvcName + "'");
boolean res = waitForCondition(() -> grid(0).context().systemView().view(SVCS_VIEW).size() == 0, TIMEOUT);
assertTrue(res);
diff --git a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/sql/SqlCustomParserTest.java b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/sql/SqlCustomParserTest.java
index 07da889..f62463f 100644
--- a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/sql/SqlCustomParserTest.java
+++ b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/sql/SqlCustomParserTest.java
@@ -713,11 +713,11 @@
*/
@Test
public void killService() throws Exception {
- IgniteSqlKill killService;
+ IgniteSqlKill killSrvc;
- killService = parse("kill service 'my-service'");
- assertTrue(killService instanceof IgniteSqlKillService);
- assertEquals("my-service", stringValue(((IgniteSqlKillService)killService).serviceName()));
+ killSrvc = parse("kill service 'my-service'");
+ assertTrue(killSrvc instanceof IgniteSqlKillService);
+ assertEquals("my-service", stringValue(((IgniteSqlKillService)killSrvc).serviceName()));
assertParserThrows("kill service 'my-service' 'test'", SqlParseException.class);
assertParserThrows("kill service 10000", SqlParseException.class);
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv b/modules/checkstyle/src/main/resources/abbrevations.csv
index 4b47a86..1ef3b8c 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -62,7 +62,7 @@
response,res
#returnValue,retVal
sender,snd
-#service,srvc
+service,srvc
#session,ses
#sequence,seq
#socket,sock
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/IgniteMBeansManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/IgniteMBeansManager.java
index e2a37f4..51dbe96 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/IgniteMBeansManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/IgniteMBeansManager.java
@@ -134,8 +134,8 @@
registerMBean("Compute", computeMXBean.getClass().getSimpleName(), computeMXBean, ComputeMXBean.class);
// Service management
- ServiceMXBean serviceMXBean = new ServiceMXBeanImpl(ctx);
- registerMBean("Service", serviceMXBean.getClass().getSimpleName(), serviceMXBean, ServiceMXBean.class);
+ ServiceMXBean srvcMXBean = new ServiceMXBeanImpl(ctx);
+ registerMBean("Service", srvcMXBean.getClass().getSimpleName(), srvcMXBean, ServiceMXBean.class);
// Data storage
DataStorageMXBean dataStorageMXBean = new DataStorageMXBeanImpl(ctx);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/IgniteServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/IgniteServiceProcessor.java
index dcceab4..f63c2a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/IgniteServiceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/IgniteServiceProcessor.java
@@ -1550,9 +1550,9 @@
* @return @return Service's id if exists, otherwise {@code null};
*/
@Nullable private IgniteUuid lookupDeployedServiceId(String name) {
- ServiceInfo serviceInfo = deployedServicesByName.get(name);
- if (serviceInfo != null) {
- return serviceInfo.serviceId();
+ ServiceInfo srvcInfo = deployedServicesByName.get(name);
+ if (srvcInfo != null) {
+ return srvcInfo.serviceId();
}
return null;
@@ -1713,11 +1713,11 @@
}
for (ServiceConfiguration srvcCfg : prepCfgs.cfgs) {
- ServiceInfo serviceInfo = new ServiceInfo(ctx.localNodeId(), IgniteUuid.randomUuid(), srvcCfg, true);
+ ServiceInfo srvcInfo = new ServiceInfo(ctx.localNodeId(), IgniteUuid.randomUuid(), srvcCfg, true);
- serviceInfo.context(ctx);
+ srvcInfo.context(ctx);
- staticServicesInfo.add(serviceInfo);
+ staticServicesInfo.add(srvcInfo);
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/client/ReliabilityTest.java b/modules/core/src/test/java/org/apache/ignite/client/ReliabilityTest.java
index acb72f6..4af6805 100644
--- a/modules/core/src/test/java/org/apache/ignite/client/ReliabilityTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/client/ReliabilityTest.java
@@ -590,16 +590,16 @@
public void testServiceMethodInvocationAfterFailover() throws Exception {
PersonExternalizable person = new PersonExternalizable("Person 1");
- ServiceConfiguration testServiceCfg = new ServiceConfiguration();
- testServiceCfg.setName(SERVICE_NAME);
- testServiceCfg.setService(new TestService());
- testServiceCfg.setTotalCount(1);
+ ServiceConfiguration testSrvcCfg = new ServiceConfiguration();
+ testSrvcCfg.setName(SERVICE_NAME);
+ testSrvcCfg.setService(new TestService());
+ testSrvcCfg.setTotalCount(1);
Ignite ignite = null;
IgniteClient client = null;
try {
// Initialize cluster and client
- ignite = startGrid(getConfiguration().setServiceConfiguration(testServiceCfg));
+ ignite = startGrid(getConfiguration().setServiceConfiguration(testSrvcCfg));
client = startClient(ignite);
TestServiceInterface svc = client.services().serviceProxy(SERVICE_NAME, TestServiceInterface.class);
@@ -621,7 +621,7 @@
GridTestUtils.assertThrowsWithCause(() -> svc.testMethod(person), ClientConnectionException.class);
// Restore the cluster and redeploy the service.
- ignite = startGrid(getConfiguration().setServiceConfiguration(testServiceCfg));
+ ignite = startGrid(getConfiguration().setServiceConfiguration(testSrvcCfg));
// Invoke the service method with Externalizable parameter once again.
// This should restore the client connection and trigger registration of the
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java
index 347f1ab..05e5b4b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java
@@ -312,7 +312,7 @@
@Test
public void testAcquireAndExecute() throws Exception {
IgniteSemaphore semaphore = ignite(0).semaphore("testAcquireAndExecute", 1, true, true);
- ExecutorService executorService = Executors.newSingleThreadExecutor();
+ ExecutorService executorSrvc = Executors.newSingleThreadExecutor();
IgniteCallable<Integer> callable = new IgniteCallable<Integer>() {
@Override public Integer call() {
@@ -334,7 +334,7 @@
}
};
- executorService.submit(runnable);
+ executorSrvc.submit(runnable);
Thread.sleep(1000);
igniteFut.get(7000, MILLISECONDS);
@@ -343,7 +343,7 @@
assertTrue(semaphore.availablePermits() == 1);
- executorService.shutdown();
+ executorSrvc.shutdown();
}
/**
@@ -354,7 +354,7 @@
@Test
public void testAcquireAndExecuteIfFailure() {
IgniteSemaphore semaphore = ignite(0).semaphore("testAcquireAndExecuteIfFailure", 1, true, true);
- ExecutorService executorService = Executors.newSingleThreadExecutor();
+ ExecutorService executorSrvc = Executors.newSingleThreadExecutor();
IgniteCallable<Integer> callable = new IgniteCallable<Integer>() {
@Override public Integer call() {
@@ -382,7 +382,7 @@
}
};
- executorService.submit(runnable);
+ executorSrvc.submit(runnable);
((IgniteFutureImpl)igniteFut).internalFuture().get();
@@ -392,7 +392,7 @@
}
}, RuntimeException.class, "Foobar");
- executorService.shutdown();
+ executorSrvc.shutdown();
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeployClusterReadOnlyModeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeployClusterReadOnlyModeTest.java
index 0ded289..d4997dc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeployClusterReadOnlyModeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeployClusterReadOnlyModeTest.java
@@ -186,24 +186,24 @@
public void testDeployAllAllowed() {
grid(0).cluster().state(ClusterState.ACTIVE_READ_ONLY);
- Collection<String> serviceNames = new HashSet<>();
+ Collection<String> srvcNames = new HashSet<>();
for (int i = 0; i < 2; i++)
- serviceNames.add(SERVICE_NAME + "_" + i);
+ srvcNames.add(SERVICE_NAME + "_" + i);
- Set<ServiceConfiguration> configs = serviceNames.stream()
+ Set<ServiceConfiguration> configs = srvcNames.stream()
.map(GridServiceDeployClusterReadOnlyModeTest::serviceConfiguration)
.collect(toSet());
deployMultipleServices(s -> s.deployAll(configs), configs.size());
- for (String serviceName : serviceNames)
- checkServiceDeployed(serviceName, true);
+ for (String srvcName : srvcNames)
+ checkServiceDeployed(srvcName, true);
- grid(0).services().cancelAll(serviceNames);
+ grid(0).services().cancelAll(srvcNames);
- for (String serviceName : serviceNames)
- checkServiceCanceled(serviceName, true);
+ for (String srvcName : srvcNames)
+ checkServiceCanceled(srvcName, true);
}
/** */
@@ -211,24 +211,24 @@
public void testDeployAllAsyncAllowed() {
grid(0).cluster().state(ClusterState.ACTIVE_READ_ONLY);
- Collection<String> serviceNames = new HashSet<>();
+ Collection<String> srvcNames = new HashSet<>();
for (int i = 0; i < 2; i++)
- serviceNames.add(SERVICE_NAME + "_" + i);
+ srvcNames.add(SERVICE_NAME + "_" + i);
- Set<ServiceConfiguration> configs = serviceNames.stream()
+ Set<ServiceConfiguration> configs = srvcNames.stream()
.map(GridServiceDeployClusterReadOnlyModeTest::serviceConfiguration)
.collect(toSet());
deployMultipleServices(s -> s.deployAllAsync(configs), configs.size());
- for (String serviceName : serviceNames)
- checkServiceDeployed(serviceName, true);
+ for (String srvcName : srvcNames)
+ checkServiceDeployed(srvcName, true);
- grid(0).services().cancelAll(serviceNames);
+ grid(0).services().cancelAll(srvcNames);
- for (String serviceName : serviceNames)
- checkServiceCanceled(serviceName, true);
+ for (String srvcName : srvcNames)
+ checkServiceCanceled(srvcName, true);
}
/** */
@@ -256,50 +256,50 @@
/** */
@Test
public void testCancelAllAllowed() {
- Collection<String> serviceNames = new HashSet<>();
+ Collection<String> srvcNames = new HashSet<>();
for (int i = 0; i < 2; i++)
- serviceNames.add(SERVICE_NAME + "_" + i);
+ srvcNames.add(SERVICE_NAME + "_" + i);
- Set<ServiceConfiguration> configs = serviceNames.stream()
+ Set<ServiceConfiguration> configs = srvcNames.stream()
.map(GridServiceDeployClusterReadOnlyModeTest::serviceConfiguration)
.collect(toSet());
deployMultipleServices(s -> s.deployAll(configs), configs.size());
- for (String serviceName : serviceNames)
- checkServiceDeployed(serviceName, true);
+ for (String srvcName : srvcNames)
+ checkServiceDeployed(srvcName, true);
grid(0).cluster().state(ClusterState.ACTIVE_READ_ONLY);
- grid(0).services().cancelAll(serviceNames);
+ grid(0).services().cancelAll(srvcNames);
- for (String name : serviceNames)
+ for (String name : srvcNames)
checkServiceCanceled(name, true);
}
/** */
@Test
public void testCancelAllAsyncAllowed() {
- Collection<String> serviceNames = new HashSet<>();
+ Collection<String> srvcNames = new HashSet<>();
for (int i = 0; i < 2; i++)
- serviceNames.add(SERVICE_NAME + "_" + i);
+ srvcNames.add(SERVICE_NAME + "_" + i);
- Set<ServiceConfiguration> configs = serviceNames.stream()
+ Set<ServiceConfiguration> configs = srvcNames.stream()
.map(GridServiceDeployClusterReadOnlyModeTest::serviceConfiguration)
.collect(toSet());
deployMultipleServices(s -> s.deployAll(configs), configs.size());
- for (String serviceName : serviceNames)
- checkServiceDeployed(serviceName, true);
+ for (String srvcName : srvcNames)
+ checkServiceDeployed(srvcName, true);
grid(0).cluster().state(ClusterState.ACTIVE_READ_ONLY);
- grid(0).services().cancelAllAsync(serviceNames).get();
+ grid(0).services().cancelAllAsync(srvcNames).get();
- for (String name : serviceNames)
+ for (String name : srvcNames)
checkServiceCanceled(name, true);
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
index 28574a8..351e541 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
@@ -985,12 +985,12 @@
public void testDoInParallel() throws Throwable {
CyclicBarrier barrier = new CyclicBarrier(3);
- ExecutorService executorService = Executors.newFixedThreadPool(3,
+ ExecutorService executorSrvc = Executors.newFixedThreadPool(3,
new IgniteThreadFactory("testscope", "ignite-utils-test"));
try {
IgniteUtils.doInParallel(3,
- executorService,
+ executorSrvc,
asList(1, 2, 3),
i -> {
try {
@@ -1005,7 +1005,7 @@
);
}
finally {
- executorService.shutdownNow();
+ executorSrvc.shutdownNow();
}
}
@@ -1016,12 +1016,12 @@
public void testDoInParallelBatch() {
CyclicBarrier barrier = new CyclicBarrier(3);
- ExecutorService executorService = Executors.newFixedThreadPool(3,
+ ExecutorService executorSrvc = Executors.newFixedThreadPool(3,
new IgniteThreadFactory("testscope", "ignite-utils-test"));
try {
IgniteUtils.doInParallel(2,
- executorService,
+ executorSrvc,
asList(1, 2, 3),
i -> {
try {
@@ -1041,7 +1041,7 @@
assertTrue(e.toString(), X.hasCause(e, TimeoutException.class));
}
finally {
- executorService.shutdownNow();
+ executorSrvc.shutdownNow();
}
}
@@ -1082,16 +1082,16 @@
*/
@Test
public void testDoInParallelResultsOrder() throws IgniteCheckedException {
- ExecutorService executorService = Executors.newFixedThreadPool(4,
+ ExecutorService executorSrvc = Executors.newFixedThreadPool(4,
new IgniteThreadFactory("testscope", "ignite-utils-test"));
try {
for (int parallelism = 1; parallelism < 16; parallelism++)
for (int size = 0; size < 10_000; size++)
- testOrder(executorService, size, parallelism);
+ testOrder(executorSrvc, size, parallelism);
}
finally {
- executorService.shutdownNow();
+ executorSrvc.shutdownNow();
}
}
@@ -1101,14 +1101,14 @@
@Test
public void testDoInParallelWithStealingJob() throws IgniteCheckedException {
// Pool size should be less that input data collection.
- ExecutorService executorService = Executors
+ ExecutorService executorSrvc = Executors
.newSingleThreadExecutor(new IgniteThreadFactory("testscope", "ignite-utils-test"));
CountDownLatch mainThreadLatch = new CountDownLatch(1);
CountDownLatch poolThreadLatch = new CountDownLatch(1);
// Busy one thread from the pool.
- executorService.submit(new Runnable() {
+ executorSrvc.submit(new Runnable() {
@Override public void run() {
try {
poolThreadLatch.await();
@@ -1129,7 +1129,7 @@
AtomicInteger poolThreadCnt = new AtomicInteger();
Collection<Integer> res = U.doInParallel(10,
- executorService,
+ executorSrvc,
data,
new IgniteThrowableFunction<Integer, Integer>() {
@Override public Integer apply(Integer cnt) throws IgniteInterruptedCheckedException {
@@ -1174,12 +1174,12 @@
@Test
public void testDoInParallelWithStealingJobRunTaskInExecutor() throws Exception {
// Pool size should be less that input data collection.
- ExecutorService executorService = Executors.newFixedThreadPool(2,
+ ExecutorService executorSrvc = Executors.newFixedThreadPool(2,
new IgniteThreadFactory("testscope", "ignite-utils-test"));
- Future<?> f1 = executorService.submit(() -> runTask(executorService));
- Future<?> f2 = executorService.submit(() -> runTask(executorService));
- Future<?> f3 = executorService.submit(() -> runTask(executorService));
+ Future<?> f1 = executorSrvc.submit(() -> runTask(executorSrvc));
+ Future<?> f2 = executorSrvc.submit(() -> runTask(executorSrvc));
+ Future<?> f3 = executorSrvc.submit(() -> runTask(executorSrvc));
f1.get();
f2.get();
@@ -1274,13 +1274,13 @@
public void testDoInParallelException() {
String expectedEx = "ExpectedException";
- ExecutorService executorService = Executors
+ ExecutorService executorSrvc = Executors
.newSingleThreadExecutor(new IgniteThreadFactory("testscope", "ignite-utils-test"));
try {
IgniteUtils.doInParallel(
1,
- executorService,
+ executorSrvc,
asList(1, 2, 3),
i -> {
if (Integer.valueOf(1).equals(i))
@@ -1296,7 +1296,7 @@
assertEquals(expectedEx, e.getMessage());
}
finally {
- executorService.shutdownNow();
+ executorSrvc.shutdownNow();
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/P2PClassLoadingFailureHandlingTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/P2PClassLoadingFailureHandlingTest.java
index bf53f6e..05b4f36 100644
--- a/modules/core/src/test/java/org/apache/ignite/p2p/P2PClassLoadingFailureHandlingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/P2PClassLoadingFailureHandlingTest.java
@@ -166,12 +166,12 @@
Service svc = instantiateClassLoadedWithExternalClassLoader(
"org.apache.ignite.tests.p2p.classloadproblem.ServiceCausingP2PClassLoadProblem"
);
- ServiceConfiguration serviceCfg = new ServiceConfiguration()
+ ServiceConfiguration srvcCfg = new ServiceConfiguration()
.setName("p2p-classloading-failure")
.setTotalCount(1)
.setService(svc);
- assertThrows(log, () -> client.services().deploy(serviceCfg), IgniteException.class,
+ assertThrows(log, () -> client.services().deploy(srvcCfg), IgniteException.class,
"Failed to deploy some services");
assertThatFailureHandlerIsNotCalled();
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryClientSuspensionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryClientSuspensionSelfTest.java
index d05bdac..a9bf8cb 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryClientSuspensionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryClientSuspensionSelfTest.java
@@ -116,9 +116,9 @@
ClientImpl impl = U.field(client.configuration().getDiscoverySpi(), "impl");
- ScheduledExecutorService executorService = U.field(impl, "executorService");
+ ScheduledExecutorService executorSrvc = U.field(impl, "executorService");
- executorService.shutdownNow();
+ executorSrvc.shutdownNow();
System.out.println("Metrics update message suspended");
}
diff --git a/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java b/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java
index 24e1c95..26258a4 100644
--- a/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java
@@ -160,15 +160,15 @@
assert host != null;
assert port > 0;
- JMXServiceURL serviceURL = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://" + host + ':' + port + "/jmxrmi");
+ JMXServiceURL srvcURL = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://" + host + ':' + port + "/jmxrmi");
Map<String, Object> props = new HashMap<>();
props.put(JMXConnectorFactory.PROTOCOL_PROVIDER_PACKAGES, "com.sun.jmx.remote.protocol");
- System.out.println("Try to connect to JMX server [props=" + props + ", url=" + serviceURL + ']');
+ System.out.println("Try to connect to JMX server [props=" + props + ", url=" + srvcURL + ']');
- return JMXConnectorFactory.connect(serviceURL, props);
+ return JMXConnectorFactory.connect(srvcURL, props);
}
/** {@inheritDoc} */
diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
index f4365c4..1e138f2 100644
--- a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
+++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
@@ -1014,14 +1014,14 @@
WebAppContext ctx = getWebContext(cfg, igniteInstanceName, keepBinary(), servlet);
- HashLoginService hashLoginService = new HashLoginService();
- hashLoginService.setName("Test Realm");
+ HashLoginService hashLoginSrvc = new HashLoginService();
+ hashLoginSrvc.setName("Test Realm");
createRealm();
- hashLoginService.setConfig("/tmp/realm.properties");
+ hashLoginSrvc.setConfig("/tmp/realm.properties");
SecurityHandler securityHnd = ctx.getSecurityHandler();
// DefaultAuthenticatorFactory doesn't default to basic auth anymore.
securityHnd.setAuthMethod(Constraint.__BASIC_AUTH);
- securityHnd.setLoginService(hashLoginService);
+ securityHnd.setLoginService(hashLoginSrvc);
srv.setHandler(ctx);
