[08/23] ignite git commit: IGNITE-8201 REST: Added AUTHENTICATE command. Fixed session tokens. Added new tests.

2018-04-17 Thread agoncharuk 
IGNITE-8201 REST: Added AUTHENTICATE command. Fixed session tokens. Added new 
tests.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1cfc9897
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1cfc9897
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1cfc9897

Branch: refs/heads/ignite-7708
Commit: 1cfc9897f41e8d8b48510029e7b650b2ed699c9a
Parents: 737933e
Author: Alexey Kuznetsov 
Authored: Tue Apr 17 11:46:45 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Apr 17 11:46:45 2018 +0700

--
 .../client/suite/IgniteClientTestSuite.java |  6 +-
 .../JettyRestProcessorAbstractSelfTest.java | 60 ++-
 ...ettyRestProcessorAuthenticationSelfTest.java | 45 ++-
 ...rocessorAuthenticationWithCredsSelfTest.java | 32 
 ...rocessorAuthenticationWithTokenSelfTest.java | 80 
 .../processors/rest/GridRestCommand.java|  3 +
 .../processors/rest/GridRestProcessor.java  | 26 ---
 .../auth/AuthenticationCommandHandler.java  | 70 +
 .../rest/handlers/auth/package-info.java| 22 ++
 .../http/jetty/GridJettyRestHandler.java| 55 +++---
 10 files changed, 322 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1cfc9897/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
index 79fcf38..163f89a 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
@@ -49,7 +49,8 @@ import 
org.apache.ignite.internal.client.util.ClientByteUtilsTest;
 import org.apache.ignite.internal.client.util.ClientConsistentHashSelfTest;
 import org.apache.ignite.internal.client.util.ClientJavaHasherSelfTest;
 import 
org.apache.ignite.internal.processors.rest.ClientMemcachedProtocolSelfTest;
-import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorAuthenticationSelfTest;
+import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorAuthenticationWithCredsSelfTest;
+import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorAuthenticationWithTokenSelfTest;
 import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorSignedSelfTest;
 import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorUnsignedSelfTest;
 import org.apache.ignite.internal.processors.rest.RestBinaryProtocolSelfTest;
@@ -87,7 +88,8 @@ public class IgniteClientTestSuite extends TestSuite {
 // Test jetty rest processor
 suite.addTestSuite(JettyRestProcessorSignedSelfTest.class);
 suite.addTestSuite(JettyRestProcessorUnsignedSelfTest.class);
-suite.addTestSuite(JettyRestProcessorAuthenticationSelfTest.class);
+
suite.addTestSuite(JettyRestProcessorAuthenticationWithCredsSelfTest.class);
+
suite.addTestSuite(JettyRestProcessorAuthenticationWithTokenSelfTest.class);
 
 // Test TCP rest processor with original memcache client.
 suite.addTestSuite(ClientMemcachedProtocolSelfTest.class);

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cfc9897/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 5dc44c4..e36447b 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -294,14 +294,19 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 
 /**
  * @param content Content to check.
+ * @return JSON node with actual response.
  */
-private JsonNode jsonCacheOperationResponse(String content, boolean bulk) 
throws IOException {
+protected JsonNode assertResponseSucceeded(String content, boolean bulk) 
throws IOException {
 assertNotNull(content);
 assertFalse(content.isEmpty());
 
 JsonNode node = JSON_MAPPER.readTree(content);
 
-

ignite git commit: IGNITE-8201 REST: Added AUTHENTICATE command. Fixed session tokens. Added new tests.

2018-04-16 Thread akuznetsov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 7173b0c48 -> 6ee5e9fe8


IGNITE-8201 REST: Added AUTHENTICATE command. Fixed session tokens. Added new 
tests.

(cherry picked from commit 1cfc989)


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6ee5e9fe
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6ee5e9fe
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6ee5e9fe

Branch: refs/heads/ignite-2.5
Commit: 6ee5e9fe8c07353a55a2a02b84f7b94c43b5c49f
Parents: 7173b0c
Author: Alexey Kuznetsov 
Authored: Tue Apr 17 11:46:45 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Apr 17 11:55:03 2018 +0700

--
 .../client/suite/IgniteClientTestSuite.java |  6 +-
 .../JettyRestProcessorAbstractSelfTest.java | 60 ++-
 ...ettyRestProcessorAuthenticationSelfTest.java | 45 ++-
 ...rocessorAuthenticationWithCredsSelfTest.java | 32 
 ...rocessorAuthenticationWithTokenSelfTest.java | 80 
 .../processors/rest/GridRestCommand.java|  3 +
 .../processors/rest/GridRestProcessor.java  | 26 ---
 .../auth/AuthenticationCommandHandler.java  | 70 +
 .../rest/handlers/auth/package-info.java| 22 ++
 .../http/jetty/GridJettyRestHandler.java| 55 +++---
 10 files changed, 322 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6ee5e9fe/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
index 79fcf38..163f89a 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
@@ -49,7 +49,8 @@ import 
org.apache.ignite.internal.client.util.ClientByteUtilsTest;
 import org.apache.ignite.internal.client.util.ClientConsistentHashSelfTest;
 import org.apache.ignite.internal.client.util.ClientJavaHasherSelfTest;
 import 
org.apache.ignite.internal.processors.rest.ClientMemcachedProtocolSelfTest;
-import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorAuthenticationSelfTest;
+import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorAuthenticationWithCredsSelfTest;
+import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorAuthenticationWithTokenSelfTest;
 import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorSignedSelfTest;
 import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorUnsignedSelfTest;
 import org.apache.ignite.internal.processors.rest.RestBinaryProtocolSelfTest;
@@ -87,7 +88,8 @@ public class IgniteClientTestSuite extends TestSuite {
 // Test jetty rest processor
 suite.addTestSuite(JettyRestProcessorSignedSelfTest.class);
 suite.addTestSuite(JettyRestProcessorUnsignedSelfTest.class);
-suite.addTestSuite(JettyRestProcessorAuthenticationSelfTest.class);
+
suite.addTestSuite(JettyRestProcessorAuthenticationWithCredsSelfTest.class);
+
suite.addTestSuite(JettyRestProcessorAuthenticationWithTokenSelfTest.class);
 
 // Test TCP rest processor with original memcache client.
 suite.addTestSuite(ClientMemcachedProtocolSelfTest.class);

http://git-wip-us.apache.org/repos/asf/ignite/blob/6ee5e9fe/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 5dc44c4..e36447b 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -294,14 +294,19 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 
 /**
  * @param content Content to check.
+ * @return JSON node with actual response.
  */
-private JsonNode jsonCacheOperationResponse(String content, boolean bulk) 
throws IOException {
+protected JsonNode assertResponseSucceeded(String content, boolean bulk) 
throws IOException {

ignite git commit: IGNITE-8201 REST: Added AUTHENTICATE command. Fixed session tokens. Added new tests.

2018-04-16 Thread akuznetsov 
Repository: ignite
Updated Branches:
  refs/heads/master 737933e6d -> 1cfc9897f


IGNITE-8201 REST: Added AUTHENTICATE command. Fixed session tokens. Added new 
tests.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1cfc9897
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1cfc9897
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1cfc9897

Branch: refs/heads/master
Commit: 1cfc9897f41e8d8b48510029e7b650b2ed699c9a
Parents: 737933e
Author: Alexey Kuznetsov 
Authored: Tue Apr 17 11:46:45 2018 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Apr 17 11:46:45 2018 +0700

--
 .../client/suite/IgniteClientTestSuite.java |  6 +-
 .../JettyRestProcessorAbstractSelfTest.java | 60 ++-
 ...ettyRestProcessorAuthenticationSelfTest.java | 45 ++-
 ...rocessorAuthenticationWithCredsSelfTest.java | 32 
 ...rocessorAuthenticationWithTokenSelfTest.java | 80 
 .../processors/rest/GridRestCommand.java|  3 +
 .../processors/rest/GridRestProcessor.java  | 26 ---
 .../auth/AuthenticationCommandHandler.java  | 70 +
 .../rest/handlers/auth/package-info.java| 22 ++
 .../http/jetty/GridJettyRestHandler.java| 55 +++---
 10 files changed, 322 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1cfc9897/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
index 79fcf38..163f89a 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
@@ -49,7 +49,8 @@ import 
org.apache.ignite.internal.client.util.ClientByteUtilsTest;
 import org.apache.ignite.internal.client.util.ClientConsistentHashSelfTest;
 import org.apache.ignite.internal.client.util.ClientJavaHasherSelfTest;
 import 
org.apache.ignite.internal.processors.rest.ClientMemcachedProtocolSelfTest;
-import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorAuthenticationSelfTest;
+import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorAuthenticationWithCredsSelfTest;
+import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorAuthenticationWithTokenSelfTest;
 import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorSignedSelfTest;
 import 
org.apache.ignite.internal.processors.rest.JettyRestProcessorUnsignedSelfTest;
 import org.apache.ignite.internal.processors.rest.RestBinaryProtocolSelfTest;
@@ -87,7 +88,8 @@ public class IgniteClientTestSuite extends TestSuite {
 // Test jetty rest processor
 suite.addTestSuite(JettyRestProcessorSignedSelfTest.class);
 suite.addTestSuite(JettyRestProcessorUnsignedSelfTest.class);
-suite.addTestSuite(JettyRestProcessorAuthenticationSelfTest.class);
+
suite.addTestSuite(JettyRestProcessorAuthenticationWithCredsSelfTest.class);
+
suite.addTestSuite(JettyRestProcessorAuthenticationWithTokenSelfTest.class);
 
 // Test TCP rest processor with original memcache client.
 suite.addTestSuite(ClientMemcachedProtocolSelfTest.class);

http://git-wip-us.apache.org/repos/asf/ignite/blob/1cfc9897/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
--
diff --git 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 5dc44c4..e36447b 100644
--- 
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ 
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -294,14 +294,19 @@ public abstract class JettyRestProcessorAbstractSelfTest 
extends AbstractRestPro
 
 /**
  * @param content Content to check.
+ * @return JSON node with actual response.
  */
-private JsonNode jsonCacheOperationResponse(String content, boolean bulk) 
throws IOException {
+protected JsonNode assertResponseSucceeded(String content, boolean bulk) 
throws IOException {
 assertNotNull(content);
 assertFalse(content.isEmpty());