You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2022/10/18 07:49:50 UTC
[ignite] branch master updated: IGNITE-17857 Codestyle fixes
This is an automated email from the ASF dual-hosted git repository.
sergeychugunov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 7902be40f88 IGNITE-17857 Codestyle fixes
7902be40f88 is described below
commit 7902be40f88e9ba958b1aa0f868b7d3960e9ba67
Author: Sergey Chugunov <se...@gmail.com>
AuthorDate: Tue Oct 18 10:49:39 2022 +0300
IGNITE-17857 Codestyle fixes
---
.../spi/deployment/local/LocalDeploymentSpi.java | 1 -
.../uri/GridUriDeploymentConfigSelfTest.java | 31 +++++++++++++---------
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java
index 51edd6683dd..f558ca25087 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/deployment/local/LocalDeploymentSpi.java
@@ -34,7 +34,6 @@ import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.resources.LoggerResource;
import org.apache.ignite.spi.IgniteSpiAdapter;
-import org.apache.ignite.spi.IgniteSpiConsistencyChecked;
import org.apache.ignite.spi.IgniteSpiException;
import org.apache.ignite.spi.IgniteSpiMBeanAdapter;
import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport;
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentConfigSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentConfigSelfTest.java
index 61617af6ca1..af506084286 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentConfigSelfTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentConfigSelfTest.java
@@ -24,7 +24,6 @@ import org.apache.ignite.testframework.junits.spi.GridSpiTest;
import org.junit.Test;
import java.io.File;
-import java.util.Arrays;
import java.util.Collections;
/**
*
@@ -42,27 +41,35 @@ public class GridUriDeploymentConfigSelfTest extends GridSpiAbstractConfigTest<U
}
/**
+ * Verifies that mixing LocalDeploymentSpi and UriDeploymentSpi doesn't violate configuration consistency rules.
*
- * @throws Exception
+ * @throws Exception If failed.
*/
@Test
public void testClientSpiConsistencyChecked() throws Exception {
- IgniteConfiguration scfg = super.getConfiguration();
+ String srvName = "server";
+ String clientName = "client";
+
+ IgniteConfiguration srvCfg = getConfiguration();
UriDeploymentSpi deploymentSpi = new UriDeploymentSpi();
String tmpDir = GridTestProperties.getProperty("deploy.uri.tmpdir");
File tmp = new File(tmpDir);
- if (!tmp.exists()){
+
+ if (!tmp.exists())
tmp.mkdir();
- }
- deploymentSpi.setUriList(Arrays.asList("file://" + tmpDir));
- scfg.setDeploymentSpi(deploymentSpi);
- startGrid("server" , scfg);
- IgniteConfiguration ccfg = super.getConfiguration();
- startClientGrid("client" , ccfg);
+ deploymentSpi.setUriList(Collections.singletonList("file://" + tmpDir));
+ srvCfg.setDeploymentSpi(deploymentSpi);
+
+ try {
+ startGrid(srvName, srvCfg);
- stopGrid("server");
- stopGrid("client");
+ IgniteConfiguration clientCfg = getConfiguration();
+ startClientGrid(clientName, clientCfg);
+ } finally {
+ stopGrid(srvName);
+ stopGrid(clientName);
+ }
}
}