This is an automated email from the ASF dual-hosted git repository.
nizhikov 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 efde1640c7c IGNITE-24044 Remove deprecated GridClient security tests.
(#12246)
efde1640c7c is described below
commit efde1640c7c240329c85e94370961d46b4efcf63
Author: Nikita Amelchev <[email protected]>
AuthorDate: Tue Aug 5 14:19:12 2025 +0300
IGNITE-24044 Remove deprecated GridClient security tests. (#12246)
---
.../common/CacheEventSecurityContextTest.java | 55 -------------
.../cache/ClusterStateThinClientAbstractTest.java | 80 ------------------
.../ClusterStateThinClientPartitionedSelfTest.java | 30 -------
.../ClusterStateThinClientReplicatedSelfTest.java | 30 -------
.../client/AdditionalSecurityCheckTest.java | 37 +--------
.../client/AttributeSecurityCheckTest.java | 94 ----------------------
.../security/client/CommonSecurityCheckTest.java | 21 -----
.../cluster/ClusterStatePermissionTest.java | 41 +---------
.../tcp/TcpDiscoveryMultiThreadedTest.java | 2 +-
.../ignite/testsuites/IgniteCacheTestSuite5.java | 4 -
.../ignite/testsuites/SecurityTestSuite.java | 2 -
11 files changed, 4 insertions(+), 392 deletions(-)
diff --git
a/modules/clients/src/test/java/org/apache/ignite/common/CacheEventSecurityContextTest.java
b/modules/clients/src/test/java/org/apache/ignite/common/CacheEventSecurityContextTest.java
index 5aa08953203..cae0efef63f 100644
---
a/modules/clients/src/test/java/org/apache/ignite/common/CacheEventSecurityContextTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/common/CacheEventSecurityContextTest.java
@@ -45,15 +45,8 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.ClientConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
-import org.apache.ignite.internal.client.GridClient;
-import org.apache.ignite.internal.client.GridClientConfiguration;
-import org.apache.ignite.internal.client.GridClientData;
-import org.apache.ignite.internal.client.GridClientDataConfiguration;
-import org.apache.ignite.internal.client.GridClientFactory;
import org.apache.ignite.internal.processors.rest.GridRestCommand;
import org.apache.ignite.internal.util.lang.RunnableX;
-import org.apache.ignite.plugin.security.SecurityCredentials;
-import org.apache.ignite.plugin.security.SecurityCredentialsBasicProvider;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
@@ -64,7 +57,6 @@ import org.junit.runners.Parameterized;
import static com.google.common.collect.ImmutableSet.of;
import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
import static java.util.Collections.singletonMap;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -231,53 +223,6 @@ public class CacheEventSecurityContextTest extends
AbstractEventSecurityContextT
}
}
- /** Tests cache event security context in case operation is initiated from
the {@link GridClient}. */
- @Test
- public void testGridClient() throws Exception {
- Assume.assumeTrue(txIsolation == null && txConcurrency == null);
-
- operationInitiatorLogin = GRID_CLIENT_LOGIN;
-
- GridClientConfiguration cfg = new GridClientConfiguration()
- .setServers(singletonList("127.0.0.1:11211"))
- .setDataConfigurations(singletonList(new
GridClientDataConfiguration().setName(cacheName)))
- .setSecurityCredentialsProvider(new
SecurityCredentialsBasicProvider(new
SecurityCredentials(operationInitiatorLogin, "")));
-
- try (GridClient cli = GridClientFactory.start(cfg)) {
- GridClientData cache = cli.data(cacheName);
-
- checkEvents(k -> cache.put(k, "val"), false, EVT_CACHE_OBJECT_PUT);
- checkEvents(k -> cache.putAsync(k, "val").get(), false,
EVT_CACHE_OBJECT_PUT);
-
- checkEvents(k -> cache.putAll(singletonMap(k, "val")), false,
EVT_CACHE_OBJECT_PUT);
- checkEvents(k -> cache.putAllAsync(singletonMap(k, "val")).get(),
false, EVT_CACHE_OBJECT_PUT);
-
- checkEvents(cache::remove, true, EVT_CACHE_OBJECT_REMOVED);
- checkEvents(k -> cache.removeAsync(k).get(), true,
EVT_CACHE_OBJECT_REMOVED);
-
- checkEvents(k -> cache.removeAll(of(k)), true,
EVT_CACHE_OBJECT_REMOVED);
- checkEvents(k -> cache.removeAllAsync(of(k)).get(), true,
EVT_CACHE_OBJECT_REMOVED);
-
- checkEvents(cache::get, true, EVT_CACHE_OBJECT_READ);
- checkEvents(k -> cache.getAsync(k).get(), true,
EVT_CACHE_OBJECT_READ);
-
- checkEvents(k -> cache.getAll(of(k)), true, EVT_CACHE_OBJECT_READ);
- checkEvents(k -> cache.getAllAsync(of(k)).get(), true,
EVT_CACHE_OBJECT_READ);
-
- checkEvents(k -> cache.replace(k, "val"), true,
EVT_CACHE_OBJECT_PUT);
- checkEvents(k -> cache.replaceAsync(k, "val").get(), true,
EVT_CACHE_OBJECT_PUT);
-
- checkEvents(k -> cache.append(k, "val"), true,
EVT_CACHE_OBJECT_READ, EVT_CACHE_OBJECT_PUT);
- checkEvents(k -> cache.appendAsync(k, "val").get(), true,
EVT_CACHE_OBJECT_READ, EVT_CACHE_OBJECT_PUT);
-
- checkEvents(k -> cache.prepend(k, "val"), true,
EVT_CACHE_OBJECT_READ, EVT_CACHE_OBJECT_PUT);
- checkEvents(k -> cache.prependAsync(k, "val").get(), true,
EVT_CACHE_OBJECT_READ, EVT_CACHE_OBJECT_PUT);
-
- checkEvents(k -> cache.cas(k, "new_val", "val"), true,
EVT_CACHE_OBJECT_PUT);
- checkEvents(k -> cache.casAsync(k, "new_val", "val").get(), true,
EVT_CACHE_OBJECT_PUT);
- }
- }
-
/** Tests cache event security context in case operation is initiated from
the REST client. */
@Test
public void testRestClient() throws Exception {
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateThinClientAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateThinClientAbstractTest.java
deleted file mode 100644
index 49d8fcc8033..00000000000
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateThinClientAbstractTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import java.util.Collections;
-import org.apache.ignite.cluster.ClusterState;
-import org.apache.ignite.configuration.ConnectorConfiguration;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.client.GridClient;
-import org.apache.ignite.internal.client.GridClientConfiguration;
-import org.apache.ignite.internal.client.GridClientException;
-import org.apache.ignite.internal.client.GridClientFactory;
-import org.apache.ignite.internal.client.GridClientProtocol;
-
-import static
org.apache.ignite.configuration.ConnectorConfiguration.DFLT_TCP_PORT;
-
-/**
- * Tests that cluster state change works correctly with connected thin client
in different situations.
- */
-public abstract class ClusterStateThinClientAbstractTest extends
ClusterStateAbstractTest {
- /** */
- private static final String HOST = "127.0.0.1";
-
- /** */
- private static GridClient gridClient;
-
- /** */
- private int port = DFLT_TCP_PORT;
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
- return super.getConfiguration(gridName)
- .setConnectorConfiguration(new
ConnectorConfiguration().setPort(port++).setHost(HOST));
- }
-
- /** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
- super.beforeTestsStarted();
-
- GridClientConfiguration cfg = new GridClientConfiguration();
-
- cfg.setProtocol(GridClientProtocol.TCP);
- cfg.setServers(Collections.singletonList(HOST + ":" + DFLT_TCP_PORT));
-
- gridClient = GridClientFactory.start(cfg);
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- if (gridClient != null)
- gridClient.close();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
- @Override protected void changeState(ClusterState state) {
- try {
- gridClient.state().state(state, true);
- }
- catch (GridClientException e) {
- throw new RuntimeException("Can't change state to " + state, e);
- }
- }
-}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateThinClientPartitionedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateThinClientPartitionedSelfTest.java
deleted file mode 100644
index 6eab02a76c7..00000000000
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateThinClientPartitionedSelfTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.configuration.CacheConfiguration;
-
-/**
- *
- */
-public class ClusterStateThinClientPartitionedSelfTest extends
ClusterStateThinClientAbstractTest {
- /** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String
cacheName) {
- return ClusterStateTestUtils.partitionedCache(cacheName);
- }
-}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateThinClientReplicatedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateThinClientReplicatedSelfTest.java
deleted file mode 100644
index 9e92dcc2de7..00000000000
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateThinClientReplicatedSelfTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.configuration.CacheConfiguration;
-
-/**
- *
- */
-public class ClusterStateThinClientReplicatedSelfTest extends
ClusterStateThinClientAbstractTest {
- /** {@inheritDoc} */
- @Override protected CacheConfiguration cacheConfiguration(String
cacheName) {
- return ClusterStateTestUtils.replicatedCache(cacheName);
- }
-}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/AdditionalSecurityCheckTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/AdditionalSecurityCheckTest.java
index 3b2e3f91b4e..2d51e73a20c 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/AdditionalSecurityCheckTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/AdditionalSecurityCheckTest.java
@@ -22,9 +22,6 @@ import org.apache.ignite.IgniteAuthenticationException;
import org.apache.ignite.Ignition;
import org.apache.ignite.client.ClientAuthenticationException;
import org.apache.ignite.client.IgniteClient;
-import org.apache.ignite.internal.client.GridClient;
-import org.apache.ignite.internal.client.GridClientAuthenticationException;
-import org.apache.ignite.internal.client.GridClientFactory;
import org.apache.ignite.spi.IgniteSpiException;
import org.apache.ignite.testframework.GridTestUtils;
import org.junit.Test;
@@ -52,45 +49,15 @@ public class AdditionalSecurityCheckTest extends
CommonSecurityCheckTest {
assertEquals(3, ignite.cluster().topologyVersion());
assertFalse(ignite.cluster().state().active());
- try (GridClient client =
GridClientFactory.start(getGridClientConfiguration())) {
- assertTrue(client.connected());
-
- client.state().state(ACTIVE, false);
- }
-
try (IgniteClient client =
Ignition.startClient(getClientConfiguration())) {
+ client.cluster().state(ACTIVE);
+
client.createCache("test_cache");
assertEquals(1, client.cacheNames().size());
}
}
- /**
- *
- */
- @Test
- public void testClientInfoGridClientFail() throws Exception {
- Ignite ignite = startGrids(2);
-
- assertEquals(2, ignite.cluster().topologyVersion());
-
- startGrid(2);
-
- assertEquals(3, ignite.cluster().topologyVersion());
-
- fail = true;
-
- try (GridClient client =
GridClientFactory.start(getGridClientConfiguration())) {
- assertFalse(client.connected());
- GridTestUtils.assertThrowsAnyCause(log,
- () -> {
- throw client.checkLastError();
- },
- GridClientAuthenticationException.class,
- "Client version is not found.");
- }
- }
-
/**
*
*/
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/AttributeSecurityCheckTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/AttributeSecurityCheckTest.java
deleted file mode 100644
index 340fa8e1103..00000000000
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/AttributeSecurityCheckTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.security.client;
-
-import java.util.Map;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.cluster.ClusterState;
-import org.apache.ignite.internal.client.GridClient;
-import org.apache.ignite.internal.client.GridClientClusterState;
-import org.apache.ignite.internal.client.GridClientConfiguration;
-import org.apache.ignite.internal.client.GridClientFactory;
-import org.apache.ignite.internal.processors.security.UserAttributesFactory;
-import
org.apache.ignite.internal.processors.security.impl.TestAuthenticationContextSecurityPluginProvider;
-import org.apache.ignite.plugin.PluginProvider;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-import static
org.apache.ignite.plugin.security.SecurityPermissionSetBuilder.ALL_PERMISSIONS;
-
-/**
- * Checks user attributes presents in GridClient messages.
- */
-@RunWith(JUnit4.class)
-public class AttributeSecurityCheckTest extends CommonSecurityCheckTest {
- /** */
- private static Map<String, Object> userAttrs;
-
- /** {@inheritDoc} */
- @Override protected PluginProvider<?> getPluginProvider(String name) {
- return new TestAuthenticationContextSecurityPluginProvider(name, null,
ALL_PERMISSIONS,
- globalAuth, true, (ctx) -> userAttrs = ctx.nodeAttributes(),
clientData());
- }
-
- /** {@inheritDoc} */
- @Override protected GridClientConfiguration getGridClientConfiguration() {
- return super.getGridClientConfiguration()
- .setUserAttributes(userAttributes());
- }
-
- /** */
- @Test
- public void testUserAttributesInMessage() throws Exception {
- Ignite ignite = startGrids(2);
-
- assertEquals(2, ignite.cluster().topologyVersion());
-
- ignite.cluster().state(ClusterState.ACTIVE);
-
- try (GridClient client =
GridClientFactory.start(getGridClientConfiguration())) {
- assertTrue(client.connected());
-
- assertEquals(userAttrs.get("key"), "val");
-
- GridClientClusterState state = client.state();
-
- // Close a coordinator to force the client to send a
CLUSTER_CURRENT_STATE message to the other node
- // in the state.state() statement.
- ignite.close();
-
- userAttrs = null;
-
- state.state();
-
- assertEquals(userAttrs.get("key"), "val");
- }
- }
-
- /**
- * @return User attributes.
- */
- private Map<String, String> userAttributes() {
- Map<String, String> attrs = new UserAttributesFactory().create();
-
- attrs.put("key", "val");
-
- return attrs;
- }
-}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/CommonSecurityCheckTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/CommonSecurityCheckTest.java
index f6356b832a0..bcefa5a8b09 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/CommonSecurityCheckTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/client/CommonSecurityCheckTest.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.processors.security.client;
-import java.util.Arrays;
import java.util.Map;
import org.apache.ignite.client.Config;
import org.apache.ignite.client.SslMode;
@@ -25,15 +24,12 @@ import org.apache.ignite.configuration.ClientConfiguration;
import org.apache.ignite.configuration.ClientConnectorConfiguration;
import org.apache.ignite.configuration.ConnectorConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.client.GridClientConfiguration;
import org.apache.ignite.internal.processors.security.AbstractSecurityTest;
import org.apache.ignite.internal.processors.security.UserAttributesFactory;
import
org.apache.ignite.internal.processors.security.impl.TestAdditionalSecurityPluginProvider;
import org.apache.ignite.internal.processors.security.impl.TestSecurityData;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.plugin.PluginProvider;
-import org.apache.ignite.plugin.security.SecurityCredentials;
-import org.apache.ignite.plugin.security.SecurityCredentialsBasicProvider;
import org.apache.ignite.plugin.security.SecurityPermissionSetBuilder;
import org.apache.ignite.ssl.SslContextFactory;
import org.apache.ignite.testframework.GridTestUtils;
@@ -121,23 +117,6 @@ public abstract class CommonSecurityCheckTest extends
AbstractSecurityTest {
return cfg;
}
- /**
- * @return Grid client configuration.
- */
- protected GridClientConfiguration getGridClientConfiguration() {
- Map<String, String> userAttrs = new UserAttributesFactory().create();
-
- if (fail)
- userAttrs.clear();
-
- return new GridClientConfiguration()
- .setSslContextFactory(getClientSslContextFactory()::create)
- .setRouters(Arrays.asList("127.0.0.1:11211", "127.0.0.1:11212"))
- .setSecurityCredentialsProvider(
- new SecurityCredentialsBasicProvider(new
SecurityCredentials(CLIENT, "")))
- .setUserAttributes(userAttrs);
- }
-
/**
* @return Client configuration.
*/
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/cluster/ClusterStatePermissionTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/cluster/ClusterStatePermissionTest.java
index 50222208036..664e708c823 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/security/cluster/ClusterStatePermissionTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/security/cluster/ClusterStatePermissionTest.java
@@ -33,18 +33,11 @@ import
org.apache.ignite.configuration.ConnectorConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.client.GridClient;
-import org.apache.ignite.internal.client.GridClientConfiguration;
-import org.apache.ignite.internal.client.GridClientException;
-import org.apache.ignite.internal.client.GridClientFactory;
-import org.apache.ignite.internal.processors.rest.GridRestCommand;
import org.apache.ignite.internal.processors.security.AbstractSecurityTest;
import org.apache.ignite.internal.processors.security.impl.TestSecurityData;
import
org.apache.ignite.internal.processors.security.impl.TestSecurityPluginProvider;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.G;
-import org.apache.ignite.plugin.security.SecurityCredentials;
-import org.apache.ignite.plugin.security.SecurityCredentialsBasicProvider;
import org.apache.ignite.plugin.security.SecurityException;
import org.apache.ignite.plugin.security.SecurityPermission;
import org.junit.Test;
@@ -231,8 +224,6 @@ public class ClusterStatePermissionTest extends
AbstractSecurityTest {
cause = ClientAuthorizationException.class;
errMsg = "Client is not authorized to perform this operation
[errMsg=" + errMsg;
}
- else if (Initiator.REMOTE_CONTROL == initiator)
- cause = GridClientException.class;
assertThrowsAnyCause(
null,
@@ -275,28 +266,6 @@ public class ClusterStatePermissionTest extends
AbstractSecurityTest {
};
}
- case REMOTE_CONTROL: {
- GridClientConfiguration cfg = new GridClientConfiguration();
-
- cfg.setServers(asList("127.0.0.1:11211"));
-
- cfg.setSecurityCredentialsProvider(
- new SecurityCredentialsBasicProvider(new
SecurityCredentials("client", "")));
-
- return new Consumer<ClusterState>() {
- @Override public void accept(ClusterState state) {
- try (GridClient gridClient =
GridClientFactory.start(cfg)) {
- assert gridClient.connected();
-
- gridClient.state().state(state, true);
- }
- catch (GridClientException e) {
- throw new IgniteException(e.getMessage(), e);
- }
- }
- };
- }
-
default:
throw new IllegalArgumentException("Unsupported operation
initiator: " + initiator);
}
@@ -326,14 +295,6 @@ public class ClusterStatePermissionTest extends
AbstractSecurityTest {
*
* @see ClientCluster#state(ClusterState)
*/
- THIN_CLIENT,
-
- /**
- * Call from a remote control like control.sh of the REST API.
- *
- * @see GridClient
- * @see GridRestCommand#CLUSTER_SET_STATE
- */
- REMOTE_CONTROL
+ THIN_CLIENT
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
index c8b8c129403..1c2b5c9679d 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
@@ -45,8 +45,8 @@ import org.apache.ignite.events.Event;
import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.client.util.GridConcurrentHashSet;
import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
import org.apache.ignite.internal.util.typedef.G;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.U;
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
index ec0a84ab357..86735b1dbfb 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
@@ -33,8 +33,6 @@ import
org.apache.ignite.internal.processors.cache.ClusterStateNoRebalancePartit
import
org.apache.ignite.internal.processors.cache.ClusterStateNoRebalanceReplicatedTest;
import
org.apache.ignite.internal.processors.cache.ClusterStatePartitionedSelfTest;
import
org.apache.ignite.internal.processors.cache.ClusterStateReplicatedSelfTest;
-import
org.apache.ignite.internal.processors.cache.ClusterStateThinClientPartitionedSelfTest;
-import
org.apache.ignite.internal.processors.cache.ClusterStateThinClientReplicatedSelfTest;
import
org.apache.ignite.internal.processors.cache.EntryVersionConsistencyReadThroughTest;
import
org.apache.ignite.internal.processors.cache.IgniteCachePutStackOverflowSelfTest;
import
org.apache.ignite.internal.processors.cache.IgniteCacheStoreCollectionTest;
@@ -97,11 +95,9 @@ public class IgniteCacheTestSuite5 {
GridTestUtils.addTestIfNeeded(suite,
ClusterStatePartitionedSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
ClusterStateClientPartitionedSelfTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
ClusterStateThinClientPartitionedSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
ClusterStateNoRebalancePartitionedTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
ClusterStateReplicatedSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
ClusterStateClientReplicatedSelfTest.class, ignoredTests);
- GridTestUtils.addTestIfNeeded(suite,
ClusterStateThinClientReplicatedSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
ClusterStateNoRebalanceReplicatedTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite, ClusterReadOnlyModeTest.class,
ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
ClusterActivationFailureTest.class, ignoredTests);
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/SecurityTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/SecurityTestSuite.java
index fae179367ec..da3e8c262ae 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/SecurityTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/SecurityTestSuite.java
@@ -33,7 +33,6 @@ import
org.apache.ignite.internal.processors.security.cache.closure.EntryProcess
import
org.apache.ignite.internal.processors.security.cache.closure.ScanQueryRemoteSecurityContextCheckTest;
import
org.apache.ignite.internal.processors.security.client.AdditionalSecurityCheckTest;
import
org.apache.ignite.internal.processors.security.client.AdditionalSecurityCheckWithGlobalAuthTest;
-import
org.apache.ignite.internal.processors.security.client.AttributeSecurityCheckTest;
import
org.apache.ignite.internal.processors.security.client.ClientReconnectTest;
import
org.apache.ignite.internal.processors.security.client.IgniteClientContainSubjectAddressTest;
import
org.apache.ignite.internal.processors.security.client.ThinClientPermissionCheckSecurityTest;
@@ -116,7 +115,6 @@ import org.junit.runners.Suite;
InvalidServerTest.class,
AdditionalSecurityCheckTest.class,
- AttributeSecurityCheckTest.class,
AdditionalSecurityCheckWithGlobalAuthTest.class,
CacheSandboxTest.class,
